Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -ra2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision a2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1) @@ -28,6 +28,7 @@ */ TreatmentFluid { id: _root readonly property bool isStarted : vHDTreatmentStates.sbRunning + readonly property bool isIdle : vHDTreatmentStates.sbIdle // other that max saline bolus delivered, // if saline started but still is waiting for pump the button is disabled so user won't tap multiple times. readonly property bool isDisabled : vHDTreatmentStates.sbMaxReached @@ -62,7 +63,10 @@ notification { visible : true - text : isDisabled ? _private.mesgDisabled : - isWaitPump ? _private.mesgWaitForPump : _private.mesgRejectReason + text : isIdle ? "" : + isDisabled ? _private.mesgDisabled : + isWaitPump ? _private.mesgWaitForPump : + isStarted ? _private.mesgRejectReason : + "" } } Index: sources/view/hd/data/VHDTreatmentStatesData.cpp =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -ra2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1 --- sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision a2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1) @@ -54,7 +54,7 @@ ufCompleted ( vData.mUFState == GuiUFStates ::UF_COMPLETED_STATE ); // Saline Bolus states - sbOff ( vData.mSalineState == GuiSalineStates ::SALINE_BOLUS_STATE_IDLE ); + sbIdle ( vData.mSalineState == GuiSalineStates ::SALINE_BOLUS_STATE_IDLE ); sbWaitPump ( vData.mSalineState == GuiSalineStates ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ); sbRunning ( vData.mSalineState == GuiSalineStates ::SALINE_BOLUS_STATE_IN_PROGRESS ); sbMaxReached ( vData.mSalineState == GuiSalineStates ::SALINE_BOLUS_STATE_MAX_DELIVERED ); @@ -85,7 +85,7 @@ void VHDTreatmentStates::onActionReceive(const AdjustSalineResponseData &vData) { // Saline Bolus states - sbOff ( vData.mState == GuiSalineStates ::SALINE_BOLUS_STATE_IDLE ); + sbIdle ( vData.mState == GuiSalineStates ::SALINE_BOLUS_STATE_IDLE ); sbWaitPump ( vData.mState == GuiSalineStates ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP ); sbRunning ( vData.mState == GuiSalineStates ::SALINE_BOLUS_STATE_IN_PROGRESS ); sbMaxReached ( vData.mState == GuiSalineStates ::SALINE_BOLUS_STATE_MAX_DELIVERED ); Index: sources/view/hd/data/VHDTreatmentStatesData.h =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -ra2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1 --- sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision a2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1) @@ -67,7 +67,7 @@ PROPERTY( bool , ufCompleted , false) ///< UF_COMPLETED_STATE Completed state of ultrafiltration state machine // ---- Saline Bolus states - PROPERTY( bool , sbOff , true ) ///< SALINE_BOLUS_STATE_IDLE No saline bolus delivery is in progress (default state) + PROPERTY( bool , sbIdle , true ) ///< SALINE_BOLUS_STATE_IDLE No saline bolus delivery is in progress (default state) PROPERTY( bool , sbWaitPump , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP Wait for pumps to stop before starting bolus PROPERTY( bool , sbRunning , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS A saline bolus delivery is in progress PROPERTY( bool , sbMaxReached , false) ///< SALINE_BOLUS_STATE_MAX_DELIVERED Maximum saline bolus volume reached - no more saline bolus deliveries allowed