Index: AlarmMapping.csv =================================================================== diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -rfd1b031dd0c66addaa751f5d69dfef46bdfc6b7a --- AlarmMapping.csv (.../AlarmMapping.csv) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision fd1b031dd0c66addaa751f5d69dfef46bdfc6b7a) @@ -83,7 +83,7 @@ 82,"HD syringe pump DAC write failure." 83,"HD syringe pump is running while the BP is off." 84,"HD venous pressure sensor not being read." - 85,"This alarm ID is available for use." + 85,"HD pump track latch opened alarm." 86,"HD BP occlusion sensor not being read." 87,"DG heating invalid calibration record." 88,"DG concentrate pumps hall sensor out of range." @@ -148,14 +148,14 @@ 147,"DG dialysate generation conductivity fault alarm." 148,"Inlet water temperature too high." 149,"Inlet water temperature too low." - 150,"Inlet water conductivity is in warning range." + 150,"Inlet water conductivity too high." 151,"Inlet water conductivity too low." 152,"Inlet water pressure too low." 153,"HD prime completed high priority alarm." 154,"EEPROM operations (read, write, erase) failure." 155,"DG software configuration record invalid CRC." 156,"HW usage data (treatment time in HD and total consumed water in DG) failure." - 157,"Inlet water temperature is not within specified range." + 157,"This alarm ID is available for use." 158,"This alarm ID is available for use." 159,"Dialysate inlet pump failed flow vs motor speed check." 160,"Blood pump rotor speed too high." Index: denali.pro.user =================================================================== diff -u -ra3a8ae19d678d29179cc493df9de5b630185063b -rfd1b031dd0c66addaa751f5d69dfef46bdfc6b7a --- denali.pro.user (.../denali.pro.user) (revision a3a8ae19d678d29179cc493df9de5b630185063b) +++ denali.pro.user (.../denali.pro.user) (revision fd1b031dd0c66addaa751f5d69dfef46bdfc6b7a) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rfd1b031dd0c66addaa751f5d69dfef46bdfc6b7a --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision fd1b031dd0c66addaa751f5d69dfef46bdfc6b7a) @@ -63,10 +63,16 @@ contentHeight: _parametersGrid.height TouchGrid { id: _parametersGrid - height : rowCount * ( rowSpacing + itemHeight ) + itemHeight + // TODO: fixed only for this list since it has been used other places. + // investigate more to move these readonly properties in the TouchGrid component. + readonly property int _itemCount: vPostTreatmentAdjustmentTreatmentLog.parametersTitle.length + readonly property int _colCount : 2 + readonly property int _rowCount : Math.ceil( _itemCount / _colCount ) + + height : _rowCount * ( rowSpacing + itemHeight ) + itemHeight width : parent.width - colCount : 2 - rowCount : 17 + colCount : _colCount + rowCount : _rowCount itemWidth : 575 rowSpacing : 0 colSpacing : 50 @@ -76,12 +82,17 @@ itemsUnit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit itemsValueLeftMargin : 350 // if decreased may be covered by title itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable - itemsTouchable : [ - 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - ] + // Note: to make the item touchable + // set the touchable: true + // and set the index ot the touchable item in the itemsTouchable: [] list to 1 + // like displayed below. + touchable : false + // itemsTouchable : [ + // 0,0,0,0,0,0,0,0,0,0, + // 0,0,0,0,0,0,0,0,0,0, + // 0,0,0,0,0,0,0,0,0,0, + // 0,0,0,0,0,0,0,0,0,0, + // ] onItemClicked: _root.itemClicked(vIndex) } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -ra3a8ae19d678d29179cc493df9de5b630185063b -rfd1b031dd0c66addaa751f5d69dfef46bdfc6b7a --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a3a8ae19d678d29179cc493df9de5b630185063b) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision fd1b031dd0c66addaa751f5d69dfef46bdfc6b7a) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 28-Feb-2022 + * \date (last) 03-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -118,7 +118,7 @@ /*0082*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR : { result = QObject::tr("HD syringe pump DAC write failure." ); break; } /* 82*/ /*0083*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR : { result = QObject::tr("HD syringe pump is running while the BP is off." ); break; } /* 83*/ /*0084*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD venous pressure sensor not being read." ); break; } /* 84*/ -/*0085*/case GuiAlarmID::ALARM_ID_____AVAILABLE_25 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 85*/ +/*0085*/case GuiAlarmID::ALARM_ID_PUMP_TRACK_LATCH_OPENED : { result = QObject::tr("HD pump track latch opened alarm." ); break; } /* 85*/ /*0086*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR : { result = QObject::tr("HD BP occlusion sensor not being read." ); break; } /* 86*/ /*0087*/case GuiAlarmID::ALARM_ID_DG_HEATING_INVALID_CAL_RECORD : { result = QObject::tr("DG heating invalid calibration record." ); break; } /* 87*/ /*0088*/case GuiAlarmID::ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE : { result = QObject::tr("DG concentrate pumps hall sensor out of range." ); break; } /* 88*/ @@ -183,14 +183,14 @@ /*0147*/case GuiAlarmID::ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT : { result = QObject::tr("DG dialysate generation conductivity fault alarm." ); break; } /* 147*/ /*0148*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_TEMPERATURE : { result = QObject::tr("Inlet water temperature too high." ); break; } /* 148*/ /*0149*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_TEMPERATURE : { result = QObject::tr("Inlet water temperature too low." ); break; } /* 149*/ -/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE : { result = QObject::tr("Inlet water conductivity is in warning range." ); break; } /* 150*/ +/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY : { result = QObject::tr("Inlet water conductivity too high." ); break; } /* 150*/ /*0151*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY : { result = QObject::tr("Inlet water conductivity too low." ); break; } /* 151*/ /*0152*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_PRESSURE : { result = QObject::tr("Inlet water pressure too low." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH : { result = QObject::tr("HD prime completed high priority alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE : { result = QObject::tr("EEPROM operations (read, write, erase) failure." ); break; } /* 154*/ /*0155*/case GuiAlarmID::ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC : { result = QObject::tr("DG software configuration record invalid CRC." ); break; } /* 155*/ /*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure." ); break; } /* 156*/ -/*0157*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("Inlet water temperature is not within specified range." ); break; } /* 157*/ +/*0157*/case GuiAlarmID::ALARM_ID____AVAILABLE_23 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID____AVAILABLE_24 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 158*/ /*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH : { result = QObject::tr("Blood pump rotor speed too high." ); break; } /* 160*/