Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) @@ -368,6 +368,53 @@ ID_DDCalibrationPressureRsp = 0x1901, // 281 //// ----- @LEAHIZED ID_AdjustDDCalibrationPressureReq = 0x1A01, // 282 //// ----- @LEAHIZED ID_AdjustDDCalibrationPressureRsp = 0x1B01, // 283 //// ----- @LEAHIZED + + ID_DDCalibrationTemperatureReq = 0x1C01, // 284 //// ----- @LEAHIZED + ID_DDCalibrationTemperatureRsp = 0x1D01, // 285 //// ----- @LEAHIZED + ID_AdjustDDCalibrationTemperatureReq = 0x1E01, // 286 //// ----- @LEAHIZED + ID_AdjustDDCalibrationTemperatureRsp = 0x1F01, // 287 //// ----- @LEAHIZED + +// = 0x2001, +// = 0x2101, +// = 0x2201, +// = 0x2301, + +// = 0x2401, +// = 0x2501, +// = 0x2601, +// = 0x2701, + +// = 0x2801, +// = 0x2901, +// = 0x2A01, +// = 0x2B01, + +// = 0x2C01, +// = 0x2D01, +// = 0x2E01, +// = 0x2F01, + +// = 0x3001, +// = 0x3101, +// = 0x3201, +// = 0x3301, + +// = 0x3401, +// = 0x3501, +// = 0x3601, +// = 0x3701, + +// = 0x3801, +// = 0x3901, +// = 0x3A01, +// = 0x3B01, + +// = 0x3C01, +// = 0x3D01, +// = 0x3E01, +// = 0x3F01, + + }; enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { @@ -456,6 +503,12 @@ Q_ENUM(DD_Disinfect_States) Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) + Q_ENUM(PressureSensors) + Q_ENUM(SENSORS_NAME) // temperature + Q_ENUM(ConcentratePumps) + Q_ENUM(dd_acid_types) + Q_ENUM(dd_bicarb_types) + Q_ENUM(Conductivity_Sensors) #include "FPDefs.h" }; @@ -533,6 +586,12 @@ // DD Valves typedef GuiActions::DD_Valves GuiDDValves; + typedef GuiActions::PressureSensors GuiDDCalibrationPressure; + typedef GuiActions::SENSORS_NAME GuiDDCalibrationTemperature; + typedef GuiActions::ConcentratePumps GuiDDCalibrationConcentratePump; + typedef GuiActions::dd_acid_types GuiDDCalibrationAcidType; + typedef GuiActions::dd_bicarb_types GuiDDCalibrationBicarbType; + typedef GuiActions::Conductivity_Sensors GuiDDCalibrationConductivitySensor; typedef QMap GuiStringIndexMap; typedef QPair GuiStringIndexMapItem; Index: sources/gui/qml/dialogs/CalibrationDialog.qml =================================================================== diff -u -rb2a0a682b4f9bcf52352e6cb6206ba10f09c7847 -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d --- sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision b2a0a682b4f9bcf52352e6cb6206ba10f09c7847) +++ sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) @@ -179,6 +179,8 @@ TextEntry { id : _textEntry anchors.centerIn : parent + width :parent.width + height :parent.height text : Number(modelData).toFixed(3) ?? Variables.emptyEntry textInput.font.pixelSize: Fonts.fontPixelValueControl line.visible : false Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r320972a712c31e94413056591634859b4b3d564e -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 320972a712c31e94413056591634859b4b3d564e) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) @@ -141,7 +141,7 @@ readonly property color textNotificationNoneBg : white readonly property color textNotificationNoneFg : "#1b2b3e" - readonly property color textNotificationLowBg : "#f5a623" // ? + readonly property color textNotificationLowBg : "#02B0B0" // ? readonly property color textNotificationLowFg : white // ? readonly property color textNotificationMedBg : "#f5a623" // ? @@ -156,7 +156,7 @@ readonly property color alarmTopBarMedBg : "#db8f00" readonly property color alarmTopBarMedFg : white - readonly property color alarmTopBarLowBg : "#db8f00" + readonly property color alarmTopBarLowBg : "#02B0B0" readonly property color alarmTopBarLowFg : white readonly property color alarmTopBarNoneBg : "#db8f00" Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r718a3ed0b0693f0bc36e11931f41ccd0f49d7251 -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 718a3ed0b0693f0bc36e11931f41ccd0f49d7251) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) @@ -176,7 +176,7 @@ * * | Payload || * | || - * | #1:(U32) | \ref result | + * | #1:(F32) | \ref result | * */ class MAdjustWaterSampleResultReq : public MModel { 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