Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -rb5c4054a8cb175e43928bb0c4b08171e92065c82 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) @@ -56,7 +56,8 @@ readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump ) readonly property bool isTreatmentEnd : vTDTreatmentStates.txEnd - property int headerMenuIndex : _headerBar.headerMenuIndex + readonly property bool isIsolatedUf : vTDTreatmentStates.txIsolatedUF + property int headerMenuIndex : _headerBar.headerMenuIndex onHeaderMenuIndexChanged: { switch( _headerBar.currentScreen ) { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r7c550f70136f2f33520661a2e97fe99021cc681d -rb5c4054a8cb175e43928bb0c4b08171e92065c82 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 7c550f70136f2f33520661a2e97fe99021cc681d) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) @@ -80,7 +80,7 @@ weight : Font.Medium } color : Colors.textMain - width : contentWidth + width : _root.width height : contentHeight anchors { bottom : parent.bottom Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a -rb5c4054a8cb175e43928bb0c4b08171e92065c82 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) @@ -32,8 +32,8 @@ property int progressValue : vTreatmentTime.time_Elapsed property int timeTextValue : vTreatmentTime.time_Remaining - property bool isRunning : vTDTreatmentStates.txDialysis && - !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning ) + property bool isRunning : ( vTDTreatmentStates.txDialysis || vTDTreatmentStates.txIsolatedUF ) && + !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning ) property bool isPaused : vTDTreatmentStates.txStop || ! _root.isRunning Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -re7ddd5bebe2e455e77337b485d17ccf1d26c395d -rb5c4054a8cb175e43928bb0c4b08171e92065c82 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision e7ddd5bebe2e455e77337b485d17ccf1d26c395d) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) @@ -60,8 +60,6 @@ ufState ( vData.mIsolatedUFState ); salineState ( vData.mSalineState ); - salineState ( vData.mSalineState ); - // Ultrafiltration states // Saline Bolus states @@ -72,7 +70,7 @@ ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES ) } ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE , sbIdle ); ENUM_READ ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE , sbWaitPump ); - ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE , sbRunning ); + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE , sbRunning ); // Heparin States _heparin = false;