Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r10f525ba53f0248265eaaee6c511444a0c4cc495 -rf61d6b9a0c33bf07bc4dc056a7abaf4437f65363 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 10f525ba53f0248265eaaee6c511444a0c4cc495) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision f61d6b9a0c33bf07bc4dc056a7abaf4437f65363) @@ -196,11 +196,13 @@ 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.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 }}); + _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 }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::P9_COND , {{ eRole_Title, tr("Inlet water")}, { eRole_Component, tr("P9" )}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); + _calibrationList.insertRow( GuiDDCalibrationConductivitySensor::P18_COND, {{ eRole_Title, tr("RO outlet water")}, { eRole_Component, tr("P18")}, {eRole_Payload, initPayloadValues }, {eRole_Received, false }}); break; } } @@ -244,20 +246,57 @@ break; } case eDialysatePumpD12 : + { + DDCalibrationD12DialysatePumpRequestData data; + emit didAdjustment(data); break; + } case eDialysatePumpD48 : + { + DDCalibrationD48DialysatePumpRequestData data; + emit didAdjustment(data); break; + } case eAcidTypes : + { + for (int i = 0; i < GuiDDCalibrationAcidType::NUM_OF_ACID_TYPE; i++) { + DDCalibrationAcidConcentratesRequestData data; + data.mIndex = i; + emit didAdjustment(data); + } break; + } case eBicarbTypes : + { + for (int i = 0; i < GuiDDCalibrationBicarbType::NUM_OF_BICARB_TYPE; i++) { + DDCalibrationBicarbConcentratesRequestData data; + data.mIndex = i; + emit didAdjustment(data); + } break; + } case eAccelerometer : + { + DDCalibrationAccelerometerSensorRequestData data; + emit didAdjustment(data); break; + } case eBloodLeak : + { + DDCalibrationBloodLeakSensorRequestData data; + emit didAdjustment(data); break; + } case eConductivity : + { + for (int i = 0; i < GuiDDCalibrationConductivitySensor::NUM_OF_CONDUCTIVITY_SENSORS; i++) { + DDCalibrationConductivityRequestData data; + data.mIndex = i; + emit didAdjustment(data); + } break; } + } } /*!