Index: denali.pro.user =================================================================== diff -u -r474e5b3680d8acbf0ac79062124352d0b3d43b65 -r2fe4e09cd7e36bc092b88118d40c504b815e9854 --- denali.pro.user (.../denali.pro.user) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) +++ denali.pro.user (.../denali.pro.user) (revision 2fe4e09cd7e36bc092b88118d40c504b815e9854) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r2fe4e09cd7e36bc092b88118d40c504b815e9854 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 2fe4e09cd7e36bc092b88118d40c504b815e9854) @@ -31,6 +31,9 @@ readonly property real maximum: vTreatmentUltrafiltration.maximum readonly property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + readonly property bool isPaused: + vTreatmentAdjustmentUltrafiltrationState.isPaused || // comes from the treatment adjustment + vHDTreatmentStates.ufPaused // comes from the broadcast Treatment States salineState field clip : false x : 0 @@ -42,7 +45,7 @@ title : qsTr("ULTRAFILTRATION VOLUME") + " " + Variables.unitTextUltrafiltrationVolume notification { imageSource: "qrc:/images/iPauseGray" - text : vTreatmentAdjustmentUltrafiltrationState.isPaused || vHDTreatmentStates.ufPaused + text : _root.isPaused ? qsTr("Ultrafiltration Paused") : "" } @@ -62,6 +65,6 @@ value : _root.value valueEx : 0 - marker.color : vTreatmentAdjustmentUltrafiltrationState.isPaused ? "dimgray" : Colors.rangeMarker + marker.color : _root.isPaused ? "dimgray" : Colors.rangeMarker } }