Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r2c000124b0b889de58affa516d8e52d23de3176a -r04303ba2e0e817231ed76939c2abad5bc1a7ba45 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 2c000124b0b889de58affa516d8e52d23de3176a) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 04303ba2e0e817231ed76939c2abad5bc1a7ba45) @@ -42,6 +42,10 @@ stackView.initialItem : _root.initialItem + function clearSbReason (vValue ) { + if (vValue) vTreatmentAdjustmentSaline.adjustment_Reason = 0 + } + // Standby / Disinfection DisinfectStack { id: _disinfectStack } // Pre Treatment @@ -173,23 +177,25 @@ function onBpRampChanged ( vValue ) { page( null , vValue )} // in-Treatmet - function onTxDialysisChanged ( vValue ) { page( _treatmentStack , vValue )} + function onTxDialysisChanged ( vValue ) { page( _treatmentStack , vValue ) + clearSbReason(vValue) } function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} function onTxEndChanged ( vValue ) { page( _endTreatmentEndStack , vValue )} // Treatment Stop - function onTxStopChanged ( vValue ) { page( _treatmentStack , vValue )} + function onTxStopChanged ( vValue ) { page( _treatmentStack , vValue ) + clearSbReason(vValue) } function onTsRecirculateChanged ( vValue ) { page( null , vValue )} function onTsRecirculateDialysateChanged( vValue ) { page( null , vValue )} function onTsRecirculateBloodChanged ( vValue ) { page( null , vValue )} function onTsRecirculateNoChanged ( vValue ) { page( null , vValue )} // Saline bolus states - function onSbIdleChanged ( vValue ) { if (vValue) vTreatmentAdjustmentSaline.adjustment_Reason = 0 } - function onSbWaitPumpChanged ( vValue ) { if (vValue) vTreatmentAdjustmentSaline.adjustment_Reason = 0 } - function onSbRunningChanged ( vValue ) { if (vValue) vTreatmentAdjustmentSaline.adjustment_Reason = 0 } + function onSbIdleChanged ( vValue ) { clearSbReason(vValue) } + function onSbWaitPumpChanged ( vValue ) { clearSbReason(vValue) } + function onSbRunningChanged ( vValue ) { clearSbReason(vValue) } } Connections { target: vPreTreatmentAdjustmentInitTreatment