Index: sources/AlarmGenerator.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r00ed70b03062c6f4fa1bfd2e515efd777e086f85 --- sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 00ed70b03062c6f4fa1bfd2e515efd777e086f85) @@ -73,7 +73,7 @@ { AlarmStatusData data; data.mState = GuiAlarmPriority::ALARM_PRIORITY_HIGH; // Alarm priority - data.mTop = GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SDCARD; // Alarm ID + data.mTop = GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SDCARD; // Alarm ID data.mMuteTimeout = 0; // Alarm timeout data.mEscalatesIn = 0; // Alarm Escalate Time Period data.mFlags = setBits(NO_BUTTON); // No button since there is no HD to communicate. Index: sources/ApplicationPost.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r00ed70b03062c6f4fa1bfd2e515efd777e086f85 --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 00ed70b03062c6f4fa1bfd2e515efd777e086f85) @@ -81,7 +81,7 @@ bool ApplicationPost::checkShaSum() { bool ok = _content.contains(_postmsg_shasum + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SHASUM); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SHASUM); emit didShaSum(ok); return ok; } @@ -94,7 +94,7 @@ bool ApplicationPost::checkCANBus() { bool ok = _content.contains(_postmsg_canbus + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_CANBUS); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_CANBUS); emit didCANBus(ok); return ok; } @@ -108,7 +108,7 @@ { bool ok = true; //TODO: do the test : not a good test has been found yet. - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_DISPLAY); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_DISPLAY); emit didDisplay(ok); return ok; } @@ -121,7 +121,7 @@ bool ApplicationPost::checkTouch() { bool ok = _content.contains(_postmsg_touch + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_TOUCH); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_TOUCH); emit didTouch(ok); return ok; } @@ -134,7 +134,7 @@ bool ApplicationPost::checkSDCard() { bool ok = _content.contains(_postmsg_sdcard + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SDCARD); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SDCARD); emit didSDCard(ok); return ok; } @@ -147,7 +147,7 @@ bool ApplicationPost::checkRtc() { bool ok = _content.contains(_postmsg_rtc + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_RTC); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_RTC); emit didRtc(ok); return ok; } @@ -160,7 +160,7 @@ bool ApplicationPost::checkWiFi() { bool ok = _content.contains(_postmsg_wifi + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_WIFI); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_WIFI); emit didWiFi(ok); return ok; } @@ -173,7 +173,7 @@ bool ApplicationPost::checkBluetooth() { bool ok = _content.contains(_postmsg_bluetooth + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_BLUETOOTH); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_BLUETOOTH); emit didBluetooth(ok); return ok; } @@ -189,7 +189,7 @@ if (! gDisableCloudSyncFailStop ) { ok = _content.contains(_postmsg_cloudsync + _postmsg_postfix_passed); } - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_CLOUDSYNC); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_CLOUDSYNC); emit didCloudSync(ok); return ok; } @@ -203,7 +203,7 @@ { bool ok = true; // do the test : we are not using this for now since it has been removed from the PRS. - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_ETHERNET); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_ETHERNET); emit didEthernet(ok); return ok; } @@ -217,7 +217,7 @@ { bool ok = true; // do the test - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND); + if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SOUND); emit didSound(ok); return ok; } Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -ra0fca1850efe5a9d00bd3308e347d115ef36c479 -r00ed70b03062c6f4fa1bfd2e515efd777e086f85 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision a0fca1850efe5a9d00bd3308e347d115ef36c479) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 00ed70b03062c6f4fa1bfd2e515efd777e086f85) @@ -57,7 +57,13 @@ signal handleSelected() signal sliderSelected() - onValueChanged: _progressRect.value = value + // this function shall be used in case that any external value is forced to be set for the slider + // like the OFF switch wants to externally set the slider value and bypass slider controlls and checks. + // same is used in the main treatment Blood,dialyzer sliders to be set to the current value when get in to adjustment screen. + function reset(vValue) { + _root.value = vValue + _progressRect.value = vValue + } function incrementValue (vInStepSegments) { updateValue(vInStepSegments, true) Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43 -r00ed70b03062c6f4fa1bfd2e515efd777e086f85 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 00ed70b03062c6f4fa1bfd2e515efd777e086f85) @@ -53,6 +53,10 @@ anchors.horizontalCenter: parent.horizontalCenter + function reset(vValue) { + _slider.reset(vValue) + } + function setColor() { let color = Colors.textMain if ( ! _root.valid ) { color = Colors.createTreatmentInvalidParam ; return color } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -re81cebefb7bc95553f32e6ba505706683f9c12b4 -r00ed70b03062c6f4fa1bfd2e515efd777e086f85 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e81cebefb7bc95553f32e6ba505706683f9c12b4) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 00ed70b03062c6f4fa1bfd2e515efd777e086f85) @@ -197,7 +197,7 @@ mObject.active = mActive && ! mChecked mObject.adjustable = mChecked - if ( ! mChecked ) mObject.value = 0 + if ( ! mChecked ) mObject.reset ( 0 ) } } @@ -237,7 +237,7 @@ checked = ! checked } vTreatmentCreate.heparinDispensingRate = 0 - _heparinDispensingRate.value = 0 + _heparinDispensingRate.reset ( 0 ) _heparinDispensingRate.active = ! checked } @@ -315,7 +315,7 @@ checked = ! checked } vTreatmentCreate.heparinBolusVolume = 0 - _heparinBolusVolume.value = 0 + _heparinBolusVolume.reset ( 0 ) _heparinBolusVolume.active = ! checked } @@ -754,7 +754,7 @@ checked = ! checked } vTreatmentCreate.bloodPressureMeasureInterval = 0 - _bloodPressureInterval.value = 0 + _bloodPressureInterval.reset ( 0 ) _bloodPressureInterval.active = ! checked } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -r00ed70b03062c6f4fa1bfd2e515efd777e086f85 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 00ed70b03062c6f4fa1bfd2e515efd777e086f85) @@ -50,14 +50,14 @@ // reset the flow values to the current flow values function currentFlows() { - _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_PresFlow - _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_PresFlow + _bloodFlowSlider.reset ( vTreatmentBloodFlow. bloodFlow_PresFlow ) + _dialysateFlowSlider.reset ( vTreatmentDialysateFlow.dialysateFlow_PresFlow ) } // reset the flow values to the values of the adjustment response function resetFlows() { - _bloodFlowSlider.value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint - _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint + _bloodFlowSlider.reset ( vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint ) + _dialysateFlowSlider.reset ( vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint ) } onAboutToShow: {