Index: sources/view/settings/VCalibrationSettings.cpp
===================================================================
diff -u -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d
--- sources/view/settings/VCalibrationSettings.cpp	(.../VCalibrationSettings.cpp)	(revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847)
+++ sources/view/settings/VCalibrationSettings.cpp	(.../VCalibrationSettings.cpp)	(revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d)
@@ -56,6 +56,23 @@
 }
 
 /*!
+ * \brief   VCalibrationSettings::clearRejectionReason
+ * \details Slot to clear rejection reason when user is editing a rejected parameter
+ * \param   vIndex          - rejection reason index
+ * \param   vSensorIndex    - sensor index
+ */
+void View::VCalibrationSettings::clearRejectionReason(int vIndex, int vSensorIndex)
+{
+    if (vIndex < 0 || vIndex >= _columnTitle.size())
+        return;
+
+    QVariantList rejectionList = _calibrationList.data( _calibrationList.index(vSensorIndex,0) ,eRole_Rejections).toList();
+    rejectionList[vIndex] = 0;
+    _calibrationList.updateData( vSensorIndex, eRole_Rejections, rejectionList);
+    emit didModelChange();
+}
+
+/*!
  * \brief   VCalibrationSettings::refreshList
  * \details Refresh model with current selected index of calibration records
  * \param   vIndex    - calibration record index to recreate the model
@@ -69,30 +86,28 @@
         case ePressure          :
         {
             QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-            // DD Pressure sensors
-            _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")},                      { eRole_Component, tr("D9" )},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")},                             { eRole_Component, tr("D66")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")},                        { eRole_Component, tr("D51")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")},                        { eRole_Component, tr("D15")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")},                          { eRole_Component, tr("D41")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")},                             { eRole_Component, tr("D87")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            // FP Pressure sensors
-            _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")},           { eRole_Component, tr("M3") },  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")},            { eRole_Component, tr("P8") },  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")},    { eRole_Component, tr("P13")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")},                   { eRole_Component, tr("P17")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")},                    { eRole_Component, tr("P46")},  {eRole_Payload, initPayloadValues   }, {eRole_Rejections, initPayloadValues   }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::D9_PRES,  {{ eRole_Title, tr("Hydraulics Outlet Pressure")},                   { eRole_Component, tr("D9" )}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::D66_PRES, {{ eRole_Title, tr("Dry Bicarb Pressure")},                          { eRole_Component, tr("D66")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::D51_PRES, {{ eRole_Title, tr("Spent Dialysate Pressure")},                     { eRole_Component, tr("D51")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::D18_PRES, {{ eRole_Title, tr("Fresh Dialysate Pressure")},                     { eRole_Component, tr("D15")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::D41_PRES, {{ eRole_Title, tr("Transmembrane Pressure")},                       { eRole_Component, tr("D41")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::D87_PRES, {{ eRole_Title, tr("D87 Pressure Sensor")},                          { eRole_Component, tr("D87")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::M3_PRES,  {{ eRole_Title, tr("Water inlet pressure before regulator")},        { eRole_Component, tr("M3") }, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::P8_PRES,  {{ eRole_Title, tr("Water inlet pressure after regulator")},         { eRole_Component, tr("P8") }, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::P13_PRES, {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")}, { eRole_Component, tr("P13")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::P17_PRES, {{ eRole_Title, tr("Pressure before the RO filter")},                { eRole_Component, tr("P17")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
+            _calibrationList.insertRow( GuiDDCalibrationPressure::P46_PRES, {{ eRole_Title, tr("Pressure after the RO filter")},                 { eRole_Component, tr("P46")}, { eRole_Payload, initPayloadValues }, {eRole_Rejections, initPayloadValues }, {eRole_Received, false }});
             break;
         }
         case eTemperature       :
         {
             QVariantList initPayloadValues = initList ( { tr("Gain"), tr("Offset"), tr("Cal Time") } ) ;
-            _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Inlet")},        { eRole_Component, tr("D1" )},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Outlet")},       { eRole_Component, tr("D78")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Primary Heater")},   { eRole_Component, tr("D4" )},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Trimmer Heater")},              { eRole_Component, tr("D50")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ eRole_Title, tr("Conductivity")},                { eRole_Component, tr("D99")},  {eRole_Payload, initPayloadValues   },  {eRole_Received, false }});
-            _calibrationList.appendRow( {{ 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   :
@@ -166,8 +181,7 @@
     switch (vIndex) {
     case ePressure          :
     {
-            // TODO Update 10 weit hFEW ENUM
-        for (int i = 0; i  <= 10; i++) {
+        for (int i = 0; i  < GuiDDCalibrationPressure::NUM_OF_PRESSURE_SENSORS; i++) {
             DDCalibrationPressureRequestData data;
             data.mIndex = i;
             emit didAdjustment(data);
@@ -268,23 +282,7 @@
     qWarning() << "Invalid calibration payload: " << vPayload;
 }
 
-/*!
- * \brief   VCalibrationSettings::clearRejectionReason
- * \details Slot to clear rejection reason when user is editing a rejected parameter
- * \param   vIndex          - rejection reason index
- * \param   vSensorIndex    - sensor index
- */
-void View::VCalibrationSettings::clearRejectionReason(int vIndex, int vSensorIndex)
-{
-    if (vIndex < 0 || vIndex >= _columnTitle.size())
-        return;
 
-    QVariantList rejectionList = _calibrationList.data( _calibrationList.index(vSensorIndex,0) ,eRole_Rejections).toList();
-    rejectionList[vIndex] = 0;
-    _calibrationList.updateData( vSensorIndex, eRole_Rejections, rejectionList);
-    emit didModelChange();
-}
-
 /*!
  * \brief   VCalibrationSettings::onActionReceive
  * \details Slot of pressure getter response