Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -r85ccb77b7343cb0ba133b6c13585e95a23ac237e -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc) @@ -120,10 +120,16 @@ // since the rejection reason will be cleared by each trasition // so it's fine to set all at the same time // and let them cleared for their own message when each get visible. - _recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text(); - _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text(); -// _recirculateStopped .reasonText = vTreatmentAdjustmentRecirculate.text(); - _recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text(); + if ( ! vTreatmentAdjustmentRecirculate.adjustment_Accepted ) { + _recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text() + _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text() + _recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text() + } + else { + _recirculateDisconnect .reasonText = "" + _recirculateProgress .reasonText = "" + _recirculateReconnect .reasonText = "" + } } } } Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml =================================================================== diff -u -r85ccb77b7343cb0ba133b6c13585e95a23ac237e -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc) @@ -10,10 +10,10 @@ import "qrc:/pages/endtreatment" EndTreatmentBase { id: _root - headerTitle : qsTr("Recirculate In Progress") + headerTitle : qsTr("Recirculate In Progress") readonly property bool timeoutTotal : vTreatmentRecirculate .timeoutTotal - readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown * 60 + readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown readonly property int bloodFlowRate : vTreatmentParametersSetPoint.bloodFlow readonly property string recirculationImage : "" @@ -62,10 +62,10 @@ anchors { top : _infoRow.bottom topMargin : Variables.defaultMargin * 2 + bottom: footer.top horizontalCenter: parent.horizontalCenter } + onHeightChanged: print(height) source: _root.recirculationImage } - - } Index: sources/model/hd/data/treatment/MTreatmentRecirculateData.h =================================================================== diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc --- sources/model/hd/data/treatment/MTreatmentRecirculateData.h (.../MTreatmentRecirculateData.h) (revision 1da0c41020664b642359f3cd5d58a2fdc36774a2) +++ sources/model/hd/data/treatment/MTreatmentRecirculateData.h (.../MTreatmentRecirculateData.h) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc) @@ -47,7 +47,7 @@ * | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | Recirculate | * */