Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc -rf41a1003ac920b64a11fc34193972bd1240003f3 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) @@ -35,12 +35,12 @@ signal reconnectClicked () signal confirmDisconnectClicked () signal confirmReconnectClicked () -// signal recirculateResumeClicked() +// signal recirculateResumeClicked() // enum command not used comment signal treatmentEndClicked () onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 ///< User requests to re-connect to system (stop re-circulating, clamp arterial and venous lines) onConfirmReconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmReconnect () //84.1 ///< User confirms patient connected, lines un-shunted to return to treatment -// onRecirculateResumeClicked : vTreatmentAdjustmentRecirculate.doResume () //84.2 ///< User requests to resume re-circulation +// onRecirculateResumeClicked : vTreatmentAdjustmentRecirculate.doResume () // enum command not used comment ///< User requests to resume re-circulation onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd () //84.3 ///< User requests to end treatment onConfirmDisconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmDisconnect () //84.4 ///< User confirms patient disconnected, lines shunted to begin re-circulation @@ -110,6 +110,7 @@ Connections { target: vTDTreatmentStates function onRcDisconnectChanged ( vValue ) { page( _recirculateDisconnect , vValue )} // set up function onRcStartedChanged ( vValue ) { page( _recirculateProgress , vValue )} // in progress + // check during integration // function onRcStoppedChanged ( vValue ) { page( _recirculateStopped , vValue )} // complete function onRcReconnectChanged ( vValue ) { page( _recirculateReconnect , vValue )} // disconnect } @@ -120,16 +121,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. - if ( ! vTreatmentAdjustmentRecirculate.adjustment_Accepted ) { - _recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text() - _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text() - _recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text() - } - else { + if ( vTreatmentAdjustmentRecirculate.adjustment_Accepted ) { _recirculateDisconnect .reasonText = "" _recirculateProgress .reasonText = "" _recirculateReconnect .reasonText = "" } + else { + _recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text() + _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text() + _recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text() + } } } }