Index: sources/view/settings/VCalibrationSettings.cpp
===================================================================
diff -u -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d -rcaf45633324f0abb5ced699731f8d6f1c4de4510
--- sources/view/settings/VCalibrationSettings.cpp	(.../VCalibrationSettings.cpp)	(revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d)
+++ sources/view/settings/VCalibrationSettings.cpp	(.../VCalibrationSettings.cpp)	(revision caf45633324f0abb5ced699731f8d6f1c4de4510)
@@ -102,46 +102,46 @@
         case eTemperature       :
         {
             QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-            _calibrationList.insertRow( GuiDDCalibrationTemperature::D1_TEMP,  {{ eRole_Title, tr("Heat exchanger Inlet")},      { eRole_Component, tr("D1" )},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.insertRow( GuiDDCalibrationTemperature::D78_TEMP, {{ eRole_Title, tr("Heat exchanger Outlet")},     { eRole_Component, tr("D78")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.insertRow( GuiDDCalibrationTemperature::D4_TEMP,  {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.insertRow( GuiDDCalibrationTemperature::D50_TEMP, {{ eRole_Title, tr("Trimmer Heater")},            { eRole_Component, tr("D50")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.insertRow( GuiDDCalibrationTemperature::D99_TEMP, {{ eRole_Title, tr("Conductivity")},              { eRole_Component, tr("D99")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.insertRow( GuiDDCalibrationTemperature::BRD_TEMP, {{ eRole_Title, tr("Barometric")},                { eRole_Component, tr("BRD")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationTemperature::D1_TEMP,  {{ eRole_Title, tr("Heat exchanger Inlet")},      { eRole_Component, tr("D1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationTemperature::D78_TEMP, {{ eRole_Title, tr("Heat exchanger Outlet")},     { eRole_Component, tr("D78")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationTemperature::D4_TEMP,  {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationTemperature::D50_TEMP, {{ eRole_Title, tr("Trimmer Heater")},            { eRole_Component, tr("D50")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationTemperature::D99_TEMP, {{ eRole_Title, tr("Conductivity")},              { eRole_Component, tr("D99")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationTemperature::BRD_TEMP, {{ eRole_Title, tr("Barometric")},                { eRole_Component, tr("BRD")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
             break;
         }
         case eConcentratePump   :
         {
             QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("Acid")},                { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Bicarbonate")},         { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Ultrafiltration")},     { eRole_Component, tr("D76"     )}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D11_PUMP, {{ eRole_Title, tr("Acid")},            { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D10_PUMP, {{ eRole_Title, tr("Bicarbonate")},     { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConcentratePump::D76_PUMP, {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76"     )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
             break;
         }
         case eDialysatePumpD12   :
         {
             QVariantList initPayloadValues = initList  ( { tr("Target Pump Speed"), tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")},    { eRole_Component, tr("D12"     )}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")}, { eRole_Component, tr("D12" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
             break;
         }
         case eDialysatePumpD48  :
         {
             QVariantList initPayloadValues = initList  ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")},    { eRole_Component, tr("D48"     )}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")}, { eRole_Component, tr("D48" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
             break;
         }
         case eAcidTypes         :
         {
             QVariantList initPayloadValues = initList  ( { tr("Mix Ratio"), tr("Full Bottle Vol. (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("08-1251-1")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("08-2251-0")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("08-3251-9")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationAcidType::ACID_08_1251_1, {{ eRole_Title, tr("08-1251-1")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationAcidType::ACID_08_2251_0, {{ eRole_Title, tr("08-2251-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationAcidType::ACID_08_3251_9, {{ eRole_Title, tr("08-3251-9")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
             break;
         }
         case eBicarbTypes       :
         {
             QVariantList initPayloadValues = initList  ( { tr("Mix Ratio"), tr("Start Volume (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("08-677753-0")},    { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationBicarbType::BICARB_08_677753_0, {{ eRole_Title, tr("08-677753-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }});
             break;
         }
         case eAccelerometer     :
@@ -159,11 +159,11 @@
         case eConductivity         :
         {
             QVariantList initPayloadValues = initList  ( { tr("Coeff 1"),tr("Coeff 2"),tr("Coeff 3"),tr("Coeff 4"),tr("Coeff 5"),tr("Coeff 6"),tr("Coeff 7"), tr("Coeff 8"),tr("Coeff 9"),tr("Coeff 10"),tr("Coeff 11"),tr("Coeff 12"),tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")},   { eRole_Component, tr("D17")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Closed Loop Control of Dosing")},   { eRole_Component, tr("D27")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Water, Bicarbonate, and Acid")},    { eRole_Component, tr("D29")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Self Test")},                       { eRole_Component, tr("D43")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Water and Bicarb Collective")},     { eRole_Component, tr("D74")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D17_COND, {{ eRole_Title, tr("Closed Loop Control of Dosing")},   { eRole_Component, tr("D17")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D27_COND, {{ eRole_Title, tr("Closed Loop Control of Dosing")},   { eRole_Component, tr("D27")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D29_COND, {{ eRole_Title, tr("Water, Bicarbonate, and Acid")},    { eRole_Component, tr("D29")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D43_COND, {{ eRole_Title, tr("Self Test")},                       { eRole_Component, tr("D43")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::D74_COND, {{ eRole_Title, tr("Water and Bicarb Collective")},     { eRole_Component, tr("D74")}, {eRole_Payload, initPayloadValues  },  {eRole_Received, false }});
             break;
         }
     }