Index: AlarmMapping.csv =================================================================== diff -u -r3779eaac00ecfa03d5b0405171ab68a0e0ff5538 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 3779eaac00ecfa03d5b0405171ab68a0e0ff5538) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -64,9 +64,9 @@ 63,"FPGA reports failure reading arterial pressure sensor." 64,"FPGA reports failure reading venous pressure sensor." 65,"HD requests DG command with invalid parameter fault." - 66,"DG non-volatile calibration group invalid record CRC." + 66,"This alarm ID is available for use." 67,"HD blood pump occlusion self-test failure alarm." - 68,"This alarm ID is available for use." + 68,"HD active reservoir recirculation out of range." 69,"This alarm ID is available for use." 70,"HD arterial pressure self-test failure alarm." 71,"HD venous pressure self-test failure alarm." @@ -104,7 +104,7 @@ 103,"HD non-volatile calibration group invalid record CRC." 104,"Air trap level sensors reporting illegal combination of air/fluid." 105,"DG non-volatile system group invalid record CRC." - 106,"DG non-volatile service group invalid record CRC." + 106,"This alarm ID is available for use." 107,"HD reports DG restarted fault." 108,"HD syringe pump ADC error." 109,"HD syringe pump volume check error." @@ -153,9 +153,9 @@ 152,"Inlet water pressure too low." 153,"HD prime completed high priority alarm." 154,"EEPROM operations (read, write, erase) failure." - 155,"DG non-volatile service invalid record CRC." + 155,"This alarm ID is available for use." 156,"HW usage data (treatment time in HD and total consumed water in DG) failure." - 157,"Calibration record CRC failure." + 157,"This alarm ID is available for use." 158,"Blood pump failed flow vs motor speed check." 159,"Dialysate inlet pump failed flow vs motor speed check." 160,"Blood pump rotor speed too high." @@ -166,8 +166,8 @@ 165,"HD in treatment rinseback operation timeout." 166,"HD in treatment re-circ sub-mode for too long." 167,"HD cartridge door opened alarm." - 168,"This alarm ID is available for use." - 169,"This alarm ID is available for use." + 168,"HD active reservoir depletion timeout." + 169,"Dialysate flow rate out of range." 170,"HD syringe empty alarm." 171,"HD syringe pump occlusion alarm." 172,"HD syringe pump not enough Heparin alarm." @@ -235,7 +235,7 @@ 234,"RTC (i.e read time) or RAM operations failure (read or write)." 235,"HD in treatment stopped sub-mode after rinseback completed (no escalation)." 236,"HD needs new cartridge to be installed." - 237,"This alarm ID is available for use." + 237,"HD prime saline dialyzer time out alarm." 238,"HD no cartridge loaded or installed improperly alarm." 239,"HD fail to remove cartridge alarm." 240,"Bicarb conductivity out of range during bicarb pump check alarm." @@ -268,15 +268,15 @@ 267,"UI POST Bluetooth failure." 268,"UI POST Ethernet failure." 269,"UI POST Sound failure." - 270,"HD Watchdog POST failure." - 271,"HD Watchdog POST failure." + 270,"HD POST Safety Shutdown failure." + 271,"DG POST Safety Shutdown failure." 272,"HD Fan RPM out of range." 273,"HD measured blood pump flow rate is out of range." 274,"HD measured dialysate inlet pump flow rate is out of range." 275,"HD arterial pressure sensor is reading out of range." 276,"HD venous pressure sensor is reading out of range." 277,"HD BP occlusion sensor is reading out of range." - 278,"This alarm ID is available for use." + 278,"HD active reservoir weight out of range." 279,"DG dialysate drain time out." 280,"HD arterial pressure sensor read timeout error." 281,"Acid concentration bottle low volume alarm." Index: denali.pro.user =================================================================== diff -u -r07d153e397d9e845c3c213e04890f786a1d4f260 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- denali.pro.user (.../denali.pro.user) (revision 07d153e397d9e845c3c213e04890f786a1d4f260) +++ denali.pro.user (.../denali.pro.user) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -1,6 +1,6 @@ - + EnvironmentId Index: main.cpp =================================================================== diff -u -raa873f8620e3f402bf60827e9c54623b5e09280e -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- main.cpp (.../main.cpp) (revision aa873f8620e3f402bf60827e9c54623b5e09280e) +++ main.cpp (.../main.cpp) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -86,7 +86,7 @@ bool gFakeSeqAtBegin = false ; bool gDisableUnhandledReport = false ; bool gDisableTimeout = false ; -bool gDisableAlarmMoMinimize = false ; +bool gDisableAlarmNoMinimize = false ; bool gConsoleoutLogs = false ; bool gConsoleoutFrameInterface = false ; @@ -200,7 +200,7 @@ gConsoleoutLogs = parser.isSet(optionConsoleoutLogs ); gDisableUnhandledReport = parser.isSet(optionDisableUnhandledReport ); gDisableTimeout = parser.isSet(optionDisableTimeout ); - gDisableAlarmMoMinimize = parser.isSet(optionDisableAlarmMoMinimize ); + gDisableAlarmNoMinimize = parser.isSet(optionDisableAlarmMoMinimize ); if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -r2230a5b1b891f47b64165164710aa680ddfc7040 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -6,10 +6,10 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file RectSelectCreateTreatment.qml - * \author (last) Peter Lucia - * \date (last) 06-Oct-2020 - * \author (original) Peter Lucia - * \date (original) 03-Aug-2020 + * \author (last) Peter Lucia + * \date (last) 06-Oct-2020 + * \author (original) Peter Lucia + * \date (original) 03-Aug-2020 * */ @@ -27,53 +27,52 @@ * \brief A selectable grid of options with customizable number of rows and columns * where only one option is selected by the user */ -Rectangle { - id: _root +Rectangle { id: _root + property int rowCount : 2 + property int colCount : 2 + property int curIndex : -1 + property int optionHeight : Variables.gridSelectionButtonHeight + property int optionWidth : Variables.gridSelectionButtonWidth + property alias title : _title.text + property var labels : [] + anchors.horizontalCenter: parent.horizontalCenter - color: "transparent" - property int numRows : 2 - property int numCols : 2 - property int buttonHeight : Variables.gridSelectionButtonHeight - property int buttonWidth : Variables.gridSelectionButtonWidth - property var buttonNames : [] - property alias name : _text.text - property int selectedIndex : -1 + color : Colors.transparent + height : _root.rowCount * _root.optionHeight + width : _root.colCount * _root.optionWidth - height : numRows * buttonHeight - width : numCols * buttonWidth + signal clicked(int vIndex) - signal buttonClicked(int vIndex) - - Text { id: _text - text : "Title" - color : Colors.textMain; - font.pixelSize: Fonts.fontPixelFluidText + Text { id : _title + text : "" + color : Colors.textMain; + font.pixelSize : Fonts.fontPixelFluidText } - Grid { id: _grid - spacing: 5 + Grid { id : _grid + spacing : 5 anchors { - top : _text.bottom + top : _title.bottom topMargin : Variables.sliderTextMargin } - rows : parent.numRows - columns : parent.numCols - Repeater { id: _repeater - model: buttonNames + rows : _root.rowCount + columns : _root.colCount + Repeater { id : _repeater + model : labels TouchRect { id : _touchRect objectName : _root.objectName + index text.text : modelData selectable : true - height : _root.buttonHeight - width : _root.buttonWidth + height : _root.optionHeight + width : _root.optionWidth radius : Variables.dialogRadius Binding on selected { - when : _root.selectedIndex > -1 - value : index === _root.selectedIndex + when : _root.curIndex > -1 + value : index === _root.curIndex } onClicked: { - _root.selectedIndex = index - buttonClicked(index) + _root.curIndex = index + _root.clicked ( index ) } } } Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -re8afa846df4a66f2c5048416ec2763b0a138bc53 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision e8afa846df4a66f2c5048416ec2763b0a138bc53) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -78,9 +78,15 @@ } function setInteractive( vInteractive ) { - if ( _root.flickable ) _root.flickable.interactive = false + if (_root.flickable) { + _root.flickable.interactive = vInteractive + } } + function setActiveValid() { + _root.active = _root.valid = true + } + Text { id: _label text : "" anchors.top : parent.top @@ -110,12 +116,11 @@ height : Variables.progressbarFluidHeight isActive : _root.active ticks : true - onPressed : { setInteractive(false) ; _root.pressed () } - onReleased : { setInteractive(true ) ; _root.released() } - - onDragged : { _root.active = _root.valid = true } - onClicked : { _root.active = _root.valid = true } - onProgressRectClicked : { _root.active = _root.valid = true } - onProgressRectDragged : { _root.active = _root.valid = true } + onPressed : { setInteractive(false) ; _root.pressed ( ) ; setActiveValid( ) } + onDragged : { setInteractive(false) ; ; setActiveValid( ) } + onReleased : { setInteractive(true ) ; _root.released( ) ; } + onClicked : { ; ; setActiveValid( ) } + onProgressRectClicked : { ; ; setActiveValid( ) } + onProgressRectDragged : { ; ; setActiveValid( ) } } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -re8afa846df4a66f2c5048416ec2763b0a138bc53 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e8afa846df4a66f2c5048416ec2763b0a138bc53) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -32,8 +32,8 @@ header.confirmEnabled: vTreatmentCreate.continueEnabled - function setInteractive(isInteractive) { - _flickable.interactive = isInteractive + function setInteractive(vInteractive) { + _flickable.interactive = vInteractive } ScrollBar { @@ -72,218 +72,169 @@ SliderCreateTreatment { id: _bloodFlowRate objectName : "_bloodFlowRate" + label : qsTr("Blood Flow Rate") flickable : _flickable + unit : Variables.unitTextFlowRate value : vTreatmentCreate.bloodFlowRate minimum : vTreatmentCreate.bloodFlowRateMin maximum : vTreatmentCreate.bloodFlowRateMax step : vTreatmentCreate.bloodFlowRateRes - label : qsTr("Blood Flow Rate") - unit : Variables.unitTextFlowRate - onPressed : { - //setInteractive(false) - vTreatmentCreate.bloodFlowRate = value - } - onReleased: { - vTreatmentCreate.bloodFlowRate = value - //setInteractive(true) - } + onPressed : vTreatmentCreate.bloodFlowRate = value + onReleased : vTreatmentCreate.bloodFlowRate = value } SliderCreateTreatment { id: _dialysateFlowRate - objectName: "_dialysateFlowRate" - value : vTreatmentCreate.dialysateFlowRate - minimum : vTreatmentCreate.dialysateFlowRateMin - maximum : vTreatmentCreate.dialysateFlowRateMax - step : vTreatmentCreate.dialysateFlowRateRes - label : qsTr("Dialysate Flow Rate") - unit : Variables.unitTextFlowRate - onPressed: { - setInteractive(false) - vTreatmentCreate.dialysateFlowRate = value - } - onReleased: { - vTreatmentCreate.dialysateFlowRate = value - setInteractive(true) - } + objectName : "_dialysateFlowRate" + label : qsTr("Dialysate Flow Rate") + flickable : _flickable + unit : Variables.unitTextFlowRate + value : vTreatmentCreate.dialysateFlowRate + minimum : vTreatmentCreate.dialysateFlowRateMin + maximum : vTreatmentCreate.dialysateFlowRateMax + step : vTreatmentCreate.dialysateFlowRateRes + onPressed : vTreatmentCreate.dialysateFlowRate = value + onReleased : vTreatmentCreate.dialysateFlowRate = value } SliderCreateTreatment { id: _duration - objectName: "_duration" - value : vTreatmentCreate.duration - minimum : vTreatmentCreate.durationMin - maximum : vTreatmentCreate.durationMax - step : vTreatmentCreate.durationRes - label : qsTr("Duration") - unit : Variables.unitTextDuration - onPressed: { - setInteractive(false) - vTreatmentCreate.duration = value - } - onReleased: { - vTreatmentCreate.duration = value - setInteractive(true) - } + objectName : "_duration" + label : qsTr("Duration") + flickable : _flickable + unit : Variables.unitTextDuration + value : vTreatmentCreate.duration + minimum : vTreatmentCreate.durationMin + maximum : vTreatmentCreate.durationMax + step : vTreatmentCreate.durationRes + onPressed : vTreatmentCreate.duration = value + onReleased : vTreatmentCreate.duration = value } SliderCreateTreatment { id: _heparinDispensingRate - objectName: "_heparinDispensingRate" - value : vTreatmentCreate.heparinDispensingRate - minimum : vTreatmentCreate.heparinDispensingRateMin - maximum : vTreatmentCreate.heparinDispensingRateMax - step : vTreatmentCreate.heparinDispensingRateRes - label : qsTr("Heparin Dispensing Rate") - unit : Variables.unitTextDispencingRate - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinDispensingRate = value - } - onReleased: { - vTreatmentCreate.heparinDispensingRate = value - setInteractive(true) - } + objectName : "_heparinDispensingRate" + label : qsTr("Heparin Dispensing Rate") + flickable : _flickable + unit : Variables.unitTextDispencingRate + value : vTreatmentCreate.heparinDispensingRate + minimum : vTreatmentCreate.heparinDispensingRateMin + maximum : vTreatmentCreate.heparinDispensingRateMax + step : vTreatmentCreate.heparinDispensingRateRes + onPressed : vTreatmentCreate.heparinDispensingRate = value + onReleased : vTreatmentCreate.heparinDispensingRate = value } SliderCreateTreatment { id: _heparinBolusVolume - objectName: "_heparinBolusVolume" - value : vTreatmentCreate.heparinBolusVolume - minimum : vTreatmentCreate.heparinBolusVolumeMin - maximum : vTreatmentCreate.heparinBolusVolumeMax - step : vTreatmentCreate.heparinBolusVolumeRes - label : qsTr("Heparin Bolus Volume") - unit : Variables.unitTextFluid - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinBolusVolume = value - } - onReleased: { - vTreatmentCreate.heparinBolusVolume = value - setInteractive(true) - } + objectName : "_heparinBolusVolume" + label : qsTr("Heparin Bolus Volume") + flickable : _flickable + unit : Variables.unitTextFluid + value : vTreatmentCreate.heparinBolusVolume + minimum : vTreatmentCreate.heparinBolusVolumeMin + maximum : vTreatmentCreate.heparinBolusVolumeMax + step : vTreatmentCreate.heparinBolusVolumeRes + onPressed : vTreatmentCreate.heparinBolusVolume = value + onReleased : vTreatmentCreate.heparinBolusVolume = value } SliderCreateTreatment { id: _heparinStopTime - objectName: "_heparinStopTime" - value : vTreatmentCreate.heparinStopTime - minimum : vTreatmentCreate.heparinStopTimeMin - maximum : vTreatmentCreate.heparinStopTimeMax - step : vTreatmentCreate.heparinStopTimeRes - label : qsTr("Heparin Stop Time") - unit : Variables.unitTextDuration - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinStopTime = value - } - onReleased: { - vTreatmentCreate.heparinStopTime = value - setInteractive(true) - } + objectName : "_heparinStopTime" + label : qsTr("Heparin Stop Time") + flickable : _flickable + unit : Variables.unitTextDuration + value : vTreatmentCreate.heparinStopTime + minimum : vTreatmentCreate.heparinStopTimeMin + maximum : vTreatmentCreate.heparinStopTimeMax + step : vTreatmentCreate.heparinStopTimeRes + onPressed : vTreatmentCreate.heparinStopTime = value + onReleased : vTreatmentCreate.heparinStopTime = value } SliderCreateTreatment { id: _salineBolus - objectName: "_salineBolus" - value : vTreatmentCreate.salineBolusVolume - minimum : vTreatmentCreate.salineBolusVolumeMin - maximum : vTreatmentCreate.salineBolusVolumeMax - step : vTreatmentCreate.salineBolusVolumeRes - label : "Saline Bolus" - unit : Variables.unitTextFluid - onPressed: { - setInteractive(false) - vTreatmentCreate.salineBolusVolume = value - } - onReleased: { - vTreatmentCreate.salineBolusVolume = value - setInteractive(true) - } + objectName : "_salineBolus" + label : "Saline Bolus" + flickable : _flickable + unit : Variables.unitTextFluid + value : vTreatmentCreate.salineBolusVolume + minimum : vTreatmentCreate.salineBolusVolumeMin + maximum : vTreatmentCreate.salineBolusVolumeMax + step : vTreatmentCreate.salineBolusVolumeRes + onPressed : vTreatmentCreate.salineBolusVolume = value + onReleased : vTreatmentCreate.salineBolusVolume = value } Text { id: _titleTextOperation anchors.horizontalCenter: parent.horizontalCenter - text: qsTr("OPERATING PARAMETERS") - color: Colors.textMain + text : qsTr("OPERATING PARAMETERS") + color : Colors.textMain font.pixelSize: Fonts.fontPixelButton - font.bold: true + font.bold : true } - GridSelection { id: _heparinType - objectName: "_heparinTypeRect" - name: qsTr("Heparin Type") - numRows: 1 - buttonNames: vTreatmentCreate.heparinTypeOptions - onButtonClicked: { - vTreatmentCreate.heparinType = selectedIndex - } + GridSelection { id : _heparinType + objectName : "_heparinTypeRect" + title : qsTr("Heparin Type") + rowCount : 1 + labels : vTreatmentCreate.heparinTypeOptions + onClicked : vTreatmentCreate.heparinType = curIndex } - GridSelection { id: _acidConcentrate - objectName : "_acidConcentrateRect" - name : qsTr("Acid Concentrate") - buttonNames : vTreatmentCreate.acidConcentrateOptions - onButtonClicked: { - vTreatmentCreate.acidConcentrate = selectedIndex - } + GridSelection { id : _acidConcentrate + objectName : "_acidConcentrateRect" + title : qsTr("Acid Concentrate") + labels : vTreatmentCreate.acidConcentrateOptions + onClicked : vTreatmentCreate.acidConcentrate = curIndex } GridSelection { id: _bicarbonateConcentrate objectName : "_bicarbonateConcentrateRect" - name : qsTr("Bicarbonate Concentrate") - numRows: 1 - numCols: 2 - buttonNames: vTreatmentCreate.bicarbonateConcentrateOptions - onButtonClicked: { - vTreatmentCreate.bicarbonateConcentrate = selectedIndex - } + title : qsTr("Bicarbonate Concentrate") + rowCount : 1 + colCount : 2 + labels : vTreatmentCreate.bicarbonateConcentrateOptions + onClicked : vTreatmentCreate.bicarbonateConcentrate = curIndex } GridSelection { id: _dialyzerType - objectName: "_dialyzerTypeRect" - name: qsTr("Dialyzer Type") - numRows: 3 - numCols: 2 - buttonNames: vTreatmentCreate.dialyzerTypeOptions - onButtonClicked: { - vTreatmentCreate.dialyzerType = selectedIndex - } + objectName : "_dialyzerTypeRect" + title : qsTr("Dialyzer Type") + rowCount : 3 + colCount : 2 + labels : vTreatmentCreate.dialyzerTypeOptions + onClicked : vTreatmentCreate.dialyzerType = curIndex } SliderCreateTreatment { id: _dialysateTemperature - objectName: "_dialysateTemperature" - value : vTreatmentCreate.dialysateTemp - minimum : vTreatmentCreate.dialysateTempMin - maximum : vTreatmentCreate.dialysateTempMax - step : vTreatmentCreate.dialysateTempRes - label : qsTr("Dialysate Temperature") - unit : Variables.unitTextTemperature - onPressed: { - setInteractive(false) - vTreatmentCreate.dialysateTemp = value - } - onReleased: { - vTreatmentCreate.dialysateTemp = value - setInteractive(true) - } + objectName : "_dialysateTemperature" + label : qsTr("Dialysate Temperature") + flickable : _flickable + unit : Variables.unitTextTemperature + value : vTreatmentCreate.dialysateTemp + minimum : vTreatmentCreate.dialysateTempMin + maximum : vTreatmentCreate.dialysateTempMax + step : vTreatmentCreate.dialysateTempRes + onPressed : vTreatmentCreate.dialysateTemp = value + onReleased : vTreatmentCreate.dialysateTemp = value } Column { id: _arterialColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _arterialLabel - visible : true - color : Colors.textMain - text: qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" + visible : true + color : Colors.textMain + text : qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" font.pixelSize : Fonts.fontPixelFluidText anchors.left : _arterialPressureLimits.left } RangeSlider { id: _arterialPressureLimits - objectName: "_arterialPressureLimitsSlider" + objectName : "_arterialPressureLimitsSlider" // dimension - height : 5 - width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter + height : Variables.progressbarFluidHeight + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter - ticks : true - stepSnap : true - hasAdjusted : true + ticks : true + stepSnap : true + hasAdjusted : true // Texts lowerText.visible : true @@ -299,12 +250,12 @@ upperTextHorizontalCenter : true minText.visible : true - // minText.font.pixelSize : Fonts.fontPixelFluidText + // minText.font.pixelSize : Fonts.fontPixelFluidText minText.font.bold : false minVerticalEdgeVisible : false maxText.visible : true - // maxText.font.pixelSize : Fonts.fontPixelFluidText + // maxText.font.pixelSize : Fonts.fontPixelFluidText maxText.font.bold : false maxVerticalEdgeVisible : false @@ -320,36 +271,36 @@ maxValueLowerBound : vTreatmentCreate.arterialPressureLimitHighMin maxValueUpperBound : vTreatmentCreate.arterialPressureLimitHighMax // scroll handling and value updates - onPressed : { setInteractive(false) } - onDragged : { setInteractive(false) } - onReleased: { setInteractive(true ) } - onMinValueChanged: { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue } - onMaxValueChanged: { if ( maxAdjusted ) vTreatmentCreate.arterialPressureLimitHigh = maxValue } - onClicked : { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue - if ( maxAdjusted ) vTreatmentCreate.arterialPressureLimitHigh = maxValue } + onPressed : { setInteractive(false) } + onDragged : { setInteractive(false) } + onReleased : { setInteractive(true ) } + onMinValueChanged : { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue } + onMaxValueChanged : { if ( maxAdjusted ) vTreatmentCreate.arterialPressureLimitHigh = maxValue } + onClicked : { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue + if ( maxAdjusted ) vTreatmentCreate.arterialPressureLimitHigh = maxValue } } } Column { id: _venousColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _venousLabel - visible : true - color : Colors.textMain - text: qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" + visible : true + color : Colors.textMain + text : qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" font.pixelSize : Fonts.fontPixelFluidText anchors.left : _venousPressureLimits.left } RangeSlider { id: _venousPressureLimits objectName: "_venousPressureLimitsSlider" // dimension - height : 5 - width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter + height : Variables.progressbarFluidHeight + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter - ticks : true - stepSnap : true - hasAdjusted : true + ticks : true + stepSnap : true + hasAdjusted : true // Texts lowerText.visible : true @@ -386,50 +337,40 @@ maxValueLowerBound : vTreatmentCreate.venousPressureLimitHighMin maxValueUpperBound : vTreatmentCreate.venousPressureLimitHighMax // scroll handling and value updates - onPressed : { setInteractive(false) } - onDragged : { setInteractive(false) } - onReleased: { setInteractive(true ) } - onMinValueChanged: { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue } - onMaxValueChanged: { if ( maxAdjusted ) vTreatmentCreate.venousPressureLimitHigh = maxValue } - onClicked : { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue - if ( maxAdjusted ) vTreatmentCreate.venousPressureLimitHigh = maxValue } + onPressed : { setInteractive(false) } + onDragged : { setInteractive(false) } + onReleased : { setInteractive(true ) } + onMinValueChanged : { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue } + onMaxValueChanged : { if ( maxAdjusted ) vTreatmentCreate.venousPressureLimitHigh = maxValue } + onClicked : { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue + if ( maxAdjusted ) vTreatmentCreate.venousPressureLimitHigh = maxValue } } } - SliderCreateTreatment { id: _bloodPressureMeasurementInterval - objectName: "_bloodPressureMeasurementInterval" - value : vTreatmentCreate.bloodPressureMeasureInterval - minimum : vTreatmentCreate.bloodPressureMeasureIntervalMin - maximum : vTreatmentCreate.bloodPressureMeasureIntervalMax - step : vTreatmentCreate.bloodPressureMeasureIntervalRes - label : qsTr("Blood Pressure Measurement Interval") - unit : Variables.unitTextDuration - onPressed: { - setInteractive(false) - vTreatmentCreate.bloodPressureMeasureInterval = value - } - onReleased: { - vTreatmentCreate.bloodPressureMeasureInterval = value - setInteractive(true) - } + SliderCreateTreatment { id: _bloodPressureInterval + objectName : "_bloodPressureMeasurementInterval" + label : qsTr("Blood Pressure Measurement Interval") + flickable : _flickable + unit : Variables.unitTextDuration + value : vTreatmentCreate.bloodPressureMeasureInterval + minimum : vTreatmentCreate.bloodPressureMeasureIntervalMin + maximum : vTreatmentCreate.bloodPressureMeasureIntervalMax + step : vTreatmentCreate.bloodPressureMeasureIntervalRes + onPressed : vTreatmentCreate.bloodPressureMeasureInterval = value + onReleased : vTreatmentCreate.bloodPressureMeasureInterval = value } SliderCreateTreatment { id: _rinsebackFlowRate - objectName: "_rinsebackFlowRate" - value : vTreatmentCreate.rinsebackFlowRate - minimum : vTreatmentCreate.rinsebackFlowRateMin - maximum : vTreatmentCreate.rinsebackFlowRateMax - step : vTreatmentCreate.rinsebackFlowRateRes - label : qsTr("Rinseback Flow Rate") - unit : Variables.unitTextFlowRate - onPressed: { - setInteractive(false) - vTreatmentCreate.rinsebackFlowRate = value - } - onReleased: { - vTreatmentCreate.rinsebackFlowRate = value - setInteractive(true) - } + objectName : "_rinsebackFlowRate" + label : qsTr("Rinseback Flow Rate") + flickable : _flickable + unit : Variables.unitTextFlowRate + value : vTreatmentCreate.rinsebackFlowRate + minimum : vTreatmentCreate.rinsebackFlowRateMin + maximum : vTreatmentCreate.rinsebackFlowRateMax + step : vTreatmentCreate.rinsebackFlowRateRes + onPressed : vTreatmentCreate.rinsebackFlowRate = value + onReleased : vTreatmentCreate.rinsebackFlowRate = value } Item { width : 50 @@ -440,22 +381,22 @@ Connections { target: vTreatmentCreate onResetCreateTreatment: { - _bloodFlowRate.active = false - _dialysateFlowRate.active = false - _duration.active = false - _heparinDispensingRate.active = false + _bloodFlowRate .active = false + _dialysateFlowRate .active = false + _duration .active = false + _heparinDispensingRate .active = false - _heparinBolusVolume.active = false - _heparinStopTime.active = false + _heparinBolusVolume .active = false + _heparinStopTime .active = false - _salineBolus.active = false - _acidConcentrate.setActive(false) - _bicarbonateConcentrate.setActive(false) - _dialyzerType.setActive(false) + _salineBolus .active = false + _acidConcentrate .setActive(false) + _bicarbonateConcentrate .setActive(false) + _dialyzerType .setActive(false) - _dialysateTemperature.active = false - _bloodPressureMeasurementInterval.active = false - _rinsebackFlowRate.active = false + _dialysateTemperature .active = false + _bloodPressureInterval .active = false + _rinsebackFlowRate .active = false // TODO : Will be addressed in sub-task DEN-6686. // _arterialPressureLimits.isLowActive = false @@ -466,21 +407,21 @@ } onFwValidationSuccess: { - _bloodFlowRate .setValid (true) - _dialysateFlowRate .setValid (true) - _duration .setValid (true) - _heparinDispensingRate .setValid (true) + _bloodFlowRate .valid = true + _dialysateFlowRate .valid = true + _duration .valid = true + _heparinDispensingRate .valid = true - _heparinBolusVolume .setValid (true) - _heparinStopTime .setValid (true) + _heparinBolusVolume .valid = true + _heparinStopTime .valid = true - _salineBolus .setValid (true) + _salineBolus .valid = true //_acidConcentrate .setValid (true) // _bicarbonateConcentrate .setValid (true) // _dialyzerType .setValid (true) // // _dialysateTemperature .setValid (true) - // _bloodPressureMeasurementInterval .setValid (true) + // _bloodPressureInterval .setValid (true) // _rinsebackFlowRate .setValid (true) // TODO : Will be addressed in sub-task DEN-6686. @@ -490,77 +431,24 @@ // _venousPressureLimits .setHighValid(true) } - onFwValidationFailed: { - } - - onBloodFlowRate_ValidationFailed: { - _bloodFlowRate.setValid(false) - } - - onDialysateFlowRate_ValidationFailed: { - _dialysateFlowRate.setValid(false) - } - - onDuration_ValidationFailed: { - _duration.setValid(false) - } - - onHeparinDispensingRate_ValidationFailed: { - _heparinDispensingRate.setValid(false) - } - - onHeparinBolusVolume_ValidationFailed: { - _heparinBolusVolume.setValid(false) - } - - onHeparinStopTime_ValidationFailed: { - _heparinStopTime.setValid(false) - } - - onSalineBolusVolume_ValidationFailed: { - _salineBolus.setValid(false) - } - - onAcidConcentrate_ValidationFailed: { - _acidConcentrate.setValid(false) - } - - onBicarbonateConcentrate_ValidationFailed: { - _bicarbonateConcentrate.setValid(false) - } - - onDialyzerType_ValidationFailed: { - _dialyzerType.setValid(false) - } - - onDialysateTemp_ValidationFailed: { - _dialysateTemperature.setValid(false) - } - - onArterialPressureLimitLow_ValidationFailed: { - _arterialPressureLimits.setLowValid(false) - } - - onArterialPressureLimitHigh_ValidationFailed: { - _arterialPressureLimits.setHighValid(false) - } - - onVenousPressureLimitLow_ValidationFailed: { - _venousPressureLimits.setLowValid(false) - } - - onVenousPressureLimitHigh_ValidationFailed: { - _venousPressureLimits.setHighValid(false) - } - - onBloodPressureMeasureInterval_ValidationFailed: { - _bloodPressureMeasurementInterval.setValid(false) - } - - onRinsebackFlowRate_ValidationFailed: { - _rinsebackFlowRate.setValid(false) - } - + onFwValidationFailed : { } + onBloodFlowRate_ValidationFailed : _bloodFlowRate .valid = false + onDialysateFlowRate_ValidationFailed : _dialysateFlowRate .valid = false + onDuration_ValidationFailed : _duration .valid = false + onHeparinDispensingRate_ValidationFailed : _heparinDispensingRate .valid = false + onHeparinBolusVolume_ValidationFailed : _heparinBolusVolume .valid = false + onHeparinStopTime_ValidationFailed : _heparinStopTime .valid = false + onSalineBolusVolume_ValidationFailed : _salineBolus .valid = false + onAcidConcentrate_ValidationFailed : _acidConcentrate .valid = false + onBicarbonateConcentrate_ValidationFailed : _bicarbonateConcentrate .valid = false + onDialyzerType_ValidationFailed : _dialyzerType .valid = false + onDialysateTemp_ValidationFailed : _dialysateTemperature .valid = false + onArterialPressureLimitLow_ValidationFailed : _arterialPressureLimits .setLowValid ( false ) + onArterialPressureLimitHigh_ValidationFailed : _arterialPressureLimits .setHighValid ( false ) + onVenousPressureLimitLow_ValidationFailed : _venousPressureLimits .setLowValid ( false ) + onVenousPressureLimitHigh_ValidationFailed : _venousPressureLimits .setHighValid ( false ) + onBloodPressureMeasureInterval_ValidationFailed : _bloodPressureInterval .valid = false + onRinsebackFlowRate_ValidationFailed : _rinsebackFlowRate .valid = false onScrollToParameter: { let prefix = "data." let contentYMargin = 80 @@ -608,7 +496,7 @@ newContentY = _venousPressureLimits.mapToItem(_venousPressureLimits.parent, 0, 0).y } else if (parameter === prefix+"bloodPressureMeasureInterval") { - newContentY = _bloodPressureMeasurementInterval.mapToItem(_bloodPressureMeasurementInterval.parent, 0, 0).y + newContentY = _bloodPressureInterval.mapToItem(_bloodPressureInterval.parent, 0, 0).y } else if (parameter === prefix+"rinsebackFlowRate") { newContentY = _rinsebackFlowRate.mapToItem(_rinsebackFlowRate.parent, 0, 0).y Index: sources/main.h =================================================================== diff -u -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/main.h (.../main.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) +++ sources/main.h (.../main.h) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -60,7 +60,7 @@ extern bool gFakeSeqAtBegin ; extern bool gDisableUnhandledReport ; extern bool gDisableTimeout ; -extern bool gDisableAlarmMoMinimize ; +extern bool gDisableAlarmNoMinimize ; //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// #define SKIPPER_DEF(X) \ Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r3779eaac00ecfa03d5b0405171ab68a0e0ff5538 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3779eaac00ecfa03d5b0405171ab68a0e0ff5538) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 04-Nov-2021 + * \date (last) 29-Nov-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -99,9 +99,9 @@ /*0063*/case GuiAlarmID::ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT : { result = QObject::tr("FPGA reports failure reading arterial pressure sensor." ); break; } /* 63*/ /*0064*/case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT : { result = QObject::tr("FPGA reports failure reading venous pressure sensor." ); break; } /* 64*/ /*0065*/case GuiAlarmID::ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT : { result = QObject::tr("HD requests DG command with invalid parameter fault." ); break; } /* 65*/ -/*0066*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile calibration group invalid record CRC." ); break; } /* 66*/ +/*0066*/case GuiAlarmID::ALARM_ID____AVAILABLE_21 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 66*/ /*0067*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD blood pump occlusion self-test failure alarm." ); break; } /* 67*/ -/*0068*/case GuiAlarmID::ALARM_ID____AVAILABLE_5 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 68*/ +/*0068*/case GuiAlarmID::ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE : { result = QObject::tr("HD active reservoir recirculation out of range." ); break; } /* 68*/ /*0069*/case GuiAlarmID::ALARM_ID____AVAILABLE_6 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 69*/ /*0070*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE : { result = QObject::tr("HD arterial pressure self-test failure alarm." ); break; } /* 70*/ /*0071*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE : { result = QObject::tr("HD venous pressure self-test failure alarm." ); break; } /* 71*/ @@ -139,7 +139,7 @@ /*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("HD non-volatile calibration group invalid record CRC." ); break; } /* 103*/ /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid." ); break; } /* 104*/ /*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile system group invalid record CRC." ); break; } /* 105*/ -/*0106*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile service group invalid record CRC." ); break; } /* 106*/ +/*0106*/case GuiAlarmID::ALARM_ID____AVAILABLE_20 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 106*/ /*0107*/case GuiAlarmID::ALARM_ID_DG_RESTARTED_FAULT : { result = QObject::tr("HD reports DG restarted fault." ); break; } /* 107*/ /*0108*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR : { result = QObject::tr("HD syringe pump ADC error." ); break; } /* 108*/ /*0109*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR : { result = QObject::tr("HD syringe pump volume check error." ); break; } /* 109*/ @@ -188,9 +188,9 @@ /*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_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR : { result = QObject::tr("DG non-volatile service invalid record CRC." ); break; } /* 155*/ +/*0155*/case GuiAlarmID::ALARM_ID____AVAILABLE_22 : { result = QObject::tr("This alarm ID is available for use." ); 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_NVDATA_CAL_RECORD_CRC_ERROR : { result = QObject::tr("Calibration record CRC failure." ); 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_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Blood pump failed flow vs motor speed check." ); 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*/ @@ -201,8 +201,8 @@ /*0165*/case GuiAlarmID::ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM : { result = QObject::tr("HD in treatment rinseback operation timeout." ); break; } /* 165*/ /*0166*/case GuiAlarmID::ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM : { result = QObject::tr("HD in treatment re-circ sub-mode for too long." ); break; } /* 166*/ /*0167*/case GuiAlarmID::ALARM_ID_CARTRIDGE_DOOR_OPENED : { result = QObject::tr("HD cartridge door opened alarm." ); break; } /* 167*/ -/*0168*/case GuiAlarmID::ALARM_ID____AVAILABLE_1 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 168*/ -/*0169*/case GuiAlarmID::ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 169*/ +/*0168*/case GuiAlarmID::ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT : { result = QObject::tr("HD active reservoir depletion timeout." ); break; } /* 168*/ +/*0169*/case GuiAlarmID::ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE : { result = QObject::tr("Dialysate flow rate out of range." ); break; } /* 169*/ /*0170*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY : { result = QObject::tr("HD syringe empty alarm." ); break; } /* 170*/ /*0171*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION : { result = QObject::tr("HD syringe pump occlusion alarm." ); break; } /* 171*/ /*0172*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM : { result = QObject::tr("HD syringe pump not enough Heparin alarm." ); break; } /* 172*/ @@ -270,7 +270,7 @@ /*0234*/case GuiAlarmID::ALARM_ID_RTC_RAM_OPS_ERROR : { result = QObject::tr("RTC (i.e read time) or RAM operations failure (read or write)." ); break; } /* 234*/ /*0235*/case GuiAlarmID::ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK : { result = QObject::tr("HD in treatment stopped sub-mode after rinseback completed (no escalation)." ); break; } /* 235*/ /*0236*/case GuiAlarmID::ALARM_ID_INSTALL_NEW_CARTRIDGE : { result = QObject::tr("HD needs new cartridge to be installed." ); break; } /* 236*/ -/*0237*/case GuiAlarmID::ALARM_ID____AVAILABLE_7 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 237*/ +/*0237*/case GuiAlarmID::ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT : { result = QObject::tr("HD prime saline dialyzer time out alarm." ); break; } /* 237*/ /*0238*/case GuiAlarmID::ALARM_ID_NO_CARTRIDGE_LOADED : { result = QObject::tr("HD no cartridge loaded or installed improperly alarm." ); break; } /* 238*/ /*0239*/case GuiAlarmID::ALARM_ID_CARTRIDGE_REMOVAL_FAILURE : { result = QObject::tr("HD fail to remove cartridge alarm." ); break; } /* 239*/ /*0240*/case GuiAlarmID::ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Bicarb conductivity out of range during bicarb pump check alarm." ); break; } /* 240*/ @@ -303,15 +303,15 @@ /*0267*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_BLUETOOTH : { result = QObject::tr("UI POST Bluetooth failure." ); break; } /* 267*/ /*0268*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_ETHERNET : { result = QObject::tr("UI POST Ethernet failure." ); break; } /* 268*/ /*0269*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND : { result = QObject::tr("UI POST Sound failure." ); break; } /* 269*/ -/*0270*/case GuiAlarmID::ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 270*/ -/*0271*/case GuiAlarmID::ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 271*/ +/*0270*/case GuiAlarmID::ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("HD POST Safety Shutdown failure." ); break; } /* 270*/ +/*0271*/case GuiAlarmID::ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("DG POST Safety Shutdown failure." ); break; } /* 271*/ /*0272*/case GuiAlarmID::ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE : { result = QObject::tr("HD Fan RPM out of range." ); break; } /* 272*/ /*0273*/case GuiAlarmID::ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE : { result = QObject::tr("HD measured blood pump flow rate is out of range." ); break; } /* 273*/ /*0274*/case GuiAlarmID::ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE : { result = QObject::tr("HD measured dialysate inlet pump flow rate is out of range." ); break; } /* 274*/ /*0275*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("HD arterial pressure sensor is reading out of range." ); break; } /* 275*/ /*0276*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("HD venous pressure sensor is reading out of range." ); break; } /* 276*/ /*0277*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE : { result = QObject::tr("HD BP occlusion sensor is reading out of range." ); break; } /* 277*/ -/*0278*/case GuiAlarmID::ALARM_ID____AVAILABLE_3 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 278*/ +/*0278*/case GuiAlarmID::ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE : { result = QObject::tr("HD active reservoir weight out of range." ); break; } /* 278*/ /*0279*/case GuiAlarmID::ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT : { result = QObject::tr("DG dialysate drain time out." ); break; } /* 279*/ /*0280*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD arterial pressure sensor read timeout error." ); break; } /* 280*/ /*0281*/case GuiAlarmID::ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME : { result = QObject::tr("Acid concentration bottle low volume alarm." ); break; } /* 281*/ Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -re8262d170bb94046ddb767074a31530bdf4a2319 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision e8262d170bb94046ddb767074a31530bdf4a2319) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -140,7 +140,7 @@ // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_3 )); - if ( gDisableAlarmMoMinimize ) { + if ( gDisableAlarmNoMinimize ) { alarm_Flag_noMinimize (false); } else {