Index: denali.pro.user =================================================================== diff -u -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b -rc70a3e2ca2b9a679b042bf543dc331cffbd937ac --- denali.pro.user (.../denali.pro.user) (revision aabacb1dbdd30968ec8bc8ffc6c97263b09db71b) +++ denali.pro.user (.../denali.pro.user) (revision c70a3e2ca2b9a679b042bf543dc331cffbd937ac) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b -rc70a3e2ca2b9a679b042bf543dc331cffbd937ac --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision aabacb1dbdd30968ec8bc8ffc6c97263b09db71b) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c70a3e2ca2b9a679b042bf543dc331cffbd937ac) @@ -43,10 +43,11 @@ VHDTreatmentStates { id: vHDTreatmentStates } // ultrafiltration state information bar properties - readonly property bool isUFPaused : vTreatmentAdjustmentUltrafiltrationState.isPaused || + readonly property bool isUFPaused : vTreatmentAdjustmentUltrafiltrationState.isPaused || vHDTreatmentStates.ufPaused readonly property bool isUFOff : vHDTreatmentStates.ufOff - readonly property bool isUFRunning : vHDTreatmentStates.ufRunning + readonly property bool isUFRunning : ! vTreatmentAdjustmentUltrafiltrationState.isPaused && + vHDTreatmentStates.ufRunning readonly property bool isUFCompleted : vHDTreatmentStates.ufCompleted readonly property string ufInfoImageSource : isUFPaused ? "qrc:/images/iPauseGray" : isUFOff ? "qrc:/images/iOffGray" : Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rc70a3e2ca2b9a679b042bf543dc331cffbd937ac --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision c70a3e2ca2b9a679b042bf543dc331cffbd937ac) @@ -26,12 +26,13 @@ void VTreatmentAdjustmentUltrafiltrationState::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - if (adjustment_Accepted()) { + if ( vData.mAccepted ) { // the response doesn't have the state so the requested state which has been accepted is used. isPaused ( _data.requestedState == AdjustUltrafiltrationStateRequestData::ePaused ); } + adjustment_Accepted ( vData.mAccepted ); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustment ( true ); Index: sources/view/hd/data/VHDTreatmentStatesData.cpp =================================================================== diff -u -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b -rc70a3e2ca2b9a679b042bf543dc331cffbd937ac --- sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision aabacb1dbdd30968ec8bc8ffc6c97263b09db71b) +++ sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision c70a3e2ca2b9a679b042bf543dc331cffbd937ac) @@ -25,10 +25,12 @@ ufState ( vData.mUFState ); salineState ( vData.mSalineState ); + // ultrafiltration ufPaused ( vData.mUFState == GuiActions::UF_PAUSED_STATE ); ufRunning ( vData.mUFState == GuiActions::UF_RUNNING_STATE ); ufOff ( vData.mUFState == GuiActions::UF_OFF_STATE ); ufCompleted ( vData.mUFState == GuiActions::UF_COMPLETED_STATE ); + // treatment duration txPaused ( vData.mSubMode != GuiActions::TREATMENT_DIALYSIS_STATE ); } Index: sources/view/hd/data/VHDTreatmentStatesData.h =================================================================== diff -u -raabacb1dbdd30968ec8bc8ffc6c97263b09db71b -rc70a3e2ca2b9a679b042bf543dc331cffbd937ac --- sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision aabacb1dbdd30968ec8bc8ffc6c97263b09db71b) +++ sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision c70a3e2ca2b9a679b042bf543dc331cffbd937ac) @@ -54,7 +54,7 @@ // because it's only useful in FW implementation and it immediately changes to another state. PROPERTY( bool , ufPaused , false) PROPERTY( bool , ufRunning , false) - PROPERTY( bool , ufOff , false) + PROPERTY( bool , ufOff , true ) // default state PROPERTY( bool , ufCompleted , false) // treatment paused state