Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -ra6ad83a73eb80978261a408ee5a92fbc8f7faa4e --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision a6ad83a73eb80978261a408ee5a92fbc8f7faa4e) @@ -33,16 +33,11 @@ visible:false function open() { - if ( isUFRunning ) { - _treatmentAdjustmentUltrafiltrationStart .open() - } else { - _treatmentAdjustmentUltrafiltrationPaused.open() - } + _treatmentAdjustmentUltrafiltrationStart.open() } function close() { // this close should be never needed by design, but in tests it can easily happen and will block the screen touch. _treatmentAdjustmentUltrafiltrationStart .close() - _treatmentAdjustmentUltrafiltrationPaused .close() _treatmentAdjustmentUltrafiltrationEdit .close() _treatmentAdjustmentUltrafiltrationConfirm .close() } @@ -55,15 +50,13 @@ // not accepted show error in notification vTreatmentAdjustmentUltrafiltrationState.doPause() } - } - - TreatmentAdjustmentUltrafiltrationPaused { id: _treatmentAdjustmentUltrafiltrationPaused - onCloseClicked : close() onEditClicked : { close() _treatmentAdjustmentUltrafiltrationEdit.reset() // reset the slider to minimum value position _treatmentAdjustmentUltrafiltrationEdit.open() } + onIsolatedUfClicked : { + } onResumeClicked : { // send resume to HD and wait. // if accepted close() @@ -75,7 +68,7 @@ TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit onBackClicked : { close() - _treatmentAdjustmentUltrafiltrationPaused.open() + _treatmentAdjustmentUltrafiltrationStart.open() } onNextClicked : { // send Volume to HD and wait. @@ -98,21 +91,26 @@ } } + Connections { target: vTreatmentUltrafiltration + function onUfRunningChanged() { + if ( isUFRunning ) { + _treatmentAdjustmentUltrafiltrationEdit .close() + _treatmentAdjustmentUltrafiltrationConfirm .close() + _treatmentAdjustmentUltrafiltrationStart .open() + } + } + } + Connections { target: vTreatmentAdjustmentUltrafiltrationState function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) { if (vTDTreatmentStates.ufPaused) { // handle screen regarding current accepted _treatmentAdjustmentUltrafiltrationStart .close() - _treatmentAdjustmentUltrafiltrationPaused.open () - } else { - _treatmentAdjustmentUltrafiltrationPaused.close() } } else { if (vTDTreatmentStates.ufRunning) { // handle error messages regarding current accepted _treatmentAdjustmentUltrafiltrationStart.notificationText = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText - } else { - _treatmentAdjustmentUltrafiltrationPaused.notificationText = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText } } }