Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r2d37388a2b6651ea4002d6720e933315e0ba7fa3 -r28a383251ad37c669202c0a717ff90b8fc21a442 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 2d37388a2b6651ea4002d6720e933315e0ba7fa3) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 28a383251ad37c669202c0a717ff90b8fc21a442) @@ -6,31 +6,16 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file TreatmentStack.qml - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 27-Jan-2020 + * \author (last) Behrouz NematiPour + * \date (last) 09-Feb-2021 + * \author (original) Behrouz NematiPour + * \date (original) 27-Jan-2020 * */ // Qt import QtQuick 2.12 -// Project -import Gui.Actions 0.1 -import VTreatmentRanges 0.1 -import VTreatmentAdjustmentSaline 0.1 -import VHDTreatmentStates 0.1 -import VTreatmentAdjustmentUltrafiltrationState 0.1 -import VTreatmentAdjustmentUltrafiltrationEdit 0.1 -import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 -import VTreatmentAdjustmentPressuresLimits 0.1 -import VTreatmentAdjustmentHeparin 0.1 -import VTreatmentRinseback 0.1 -import VTreatmentAdjustmentRinseback 0.1 -import VTreatmentAdjustmentRecirculate 0.1 -import VTreatmentBloodPrime 0.1 - // Qml imports import "qrc:/globals" import "qrc:/components" @@ -49,21 +34,6 @@ stackView.initialItem : _treatmentHome - // Views - VHDTreatmentStates { id: vHDTreatmentStates } - - VTreatmentRanges { id: vTreatmentRanges } - VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } - VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } - VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } - VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } - VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } - VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } - VTreatmentBloodPrime { id: vTreatmentBloodPrime } - VTreatmentRinseback { id: vTreatmentRinseback } - VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } - VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } - // ultrafiltration state information bar properties readonly property bool isUFPaused : vHDTreatmentStates.ufPaused readonly property bool isUFOff : vHDTreatmentStates.ufOff @@ -231,26 +201,38 @@ } } + // Blood Prime PostTreatmentBloodPrime { id: _postTreatmentBloodPrime } + // Rinseback + PostTreatmentRinsebackInit { id: _postTreatmentRinsebackInit + onStartClicked : vTreatmentAdjustmentRinseback.doStart () //82.0 + onTreatmentEndClicked : vTreatmentAdjustmentRinseback.doTreatmentEnd () //82.8 + onTreatmentBackClicked : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9 + } PostTreatmentRinseback { id: _postTreatmentRinseback - onResumeClicked : vTreatmentAdjustmentRinseback .doResume () - onPauseClicked : vTreatmentAdjustmentRinseback .doPause () - onAccelerateClicked : vTreatmentAdjustmentRinseback .doIncrement () - onDeccelerateClicked : vTreatmentAdjustmentRinseback .doDecrement () - onEndClicked : vTreatmentAdjustmentRinseback .doEnd () + onAccelerateClicked : vTreatmentAdjustmentRinseback.doIncrement () //82.1 + onDeccelerateClicked : vTreatmentAdjustmentRinseback.doDecrement () //82.2 + onPauseClicked : vTreatmentAdjustmentRinseback.doPause () //82.3 + onResumeClicked : vTreatmentAdjustmentRinseback.doResume () //82.4 + onEndClicked : vTreatmentAdjustmentRinseback.doEnd () //82.5 } - PostTreatmentRinsebackComplete { id: _postTreatmentRinsebackComplete - onAdditionalClicked : vTreatmentAdjustmentRinseback .doAdditional () - onEndClicked : vTreatmentAdjustmentRinseback .doTreatmentEnd () - onRecirculateClicked :{ /*?*/ } + onAdditionalClicked : vTreatmentAdjustmentRinseback.doAdditional () //82.6 + onTreatmentEndClicked : vTreatmentAdjustmentRinseback.doConfirm () //82.7 + onConfirmClicked : vTreatmentAdjustmentRinseback.doTreatmentEnd () //82.8 } - + PostTreatmentAdditional { id: _postTreatmentAdditional } + // Recirculate PostTreatmentRecirculate { id: _postTreatmentRecirculate - onResumeClicked : { /*?*/ } - onEndClicked : vTreatmentAdjustmentRecirculate .doTreatmentEnd () + onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 + onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd() //84.3 } + PostTreatmentReconnect { id: _postTreatmentReconnect + onConfirmClicked : vTreatmentAdjustmentRecirculate.doConfirm () //84.1 + onRecirculateBackClicked : vTreatmentAdjustmentRecirculate.doResume () //84.2 + } + // Treatment Complete PostTreatmentComplete { id: _postTreatmentComplete } // ---------- Manages Responses ---------- @@ -370,64 +352,26 @@ // and is more optimized and will never leave screen empty // also with what ever order they have been push with the reverse/correct animation will be poped or pushed. Connections { target: vHDTreatmentStates - onTxBloodPrimeChanged: { - if ( vtxBloodPrime ) { - back( _postTreatmentBloodPrime ) - } - } + // Blood Prime + onTxBloodPrimeChanged : { if ( vtxBloodPrime ) { back( _postTreatmentBloodPrime )}} - onTxDialysisRunningChanged: { - if ( vtxDialysisRunning ) { - back( _treatmentStart ) - } - } + // in-Treatmet + onTxDialysisRunningChanged : { if ( vtxDialysisRunning ) { back( _treatmentStart )}} + onTxStopChanged : { /* only will be used to update the in-treatment screen */ } + onTxDialysisEndChanged : { if ( vtxDialysisEnd ) { back( _postTreatmentComplete )}} - onTxDialysisEndChanged: { - if ( vtxDialysisEnd ) { - // if Tx completed - // -> Rinseback - // -> End / Disconnect - // if Tx Stopped - // -> - back( _postTreatmentComplete ) - } - } + // shall push the rinseback stack which we don't have it yet. + // Rinseback + onTxRinsebackChanged : { if ( vtxRinseback ) { back( _postTreatmentRinsebackInit )}} + onRbInitChanged : { if ( vrbInit ) { back( _postTreatmentRinsebackInit )}} + onRbRunChanged : { if ( vrbRun ) { back( _postTreatmentRinseback )}} + onRbPausedChanged : { if ( vrbPaused ) { back( _postTreatmentRinseback )}} + onRbStopChanged : { if ( vrbStop ) { back( _postTreatmentRinsebackComplete )}} + onRbAdditionalChanged : { if ( vrbAdditional ) { back( _postTreatmentAdditional )}} - onTxStopChanged: { - // only will be used to update the in-treatment screen - } - - onTxRinsebackChanged: { - if ( vtxRinseback ) { - // it may be navigated from complete or stop alarm dialog, - // which in the later case it can't be replaced with main treatment - // since user is able to go back to main treament if it's not timed out. - back( _postTreatmentRinseback ) - } - } - - onRbStopChanged: { - if ( vrbStop ) { - back( _postTreatmentRinsebackComplete ) - } - } - - onRbAdditionalChanged: { - if ( vrbAdditional ) { - // it may be navigated from complete or stop alarm dialog, - // which in the later case it can't be replaced with main treatment - // since user is able to go back to main treament if it's not timed out. - back( _postTreatmentRinseback ) - } - } - - onTxRecirculateChanged: { - if ( vtxRecirculate ) { - // application state by design is navigating always from Rinseback to recirculate - // so always it is rinseback on top which has to be replaced by recirculate - // also we never go back to rinseback from recirculate and will go back to blood priming - back( _postTreatmentRecirculate ) - } - } + // Recirculate + onTxRecirculateChanged : { if ( vtxRecirculate ) { back( _postTreatmentRecirculate )}} + onRcStartedChanged : { if ( vrcStarted ) { back( _postTreatmentRecirculate )}} + onRcStoppedChanged : { if ( vrcStopped ) { back( _postTreatmentReconnect )}} } }