Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision c0c63c4b149dafea2b02e4cd31f223e392ff7818) @@ -7,7 +7,7 @@ * * \file ManagerStack.qml * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2021 + * \date (last) 10-Mar-2021 * \author (original) Behrouz NematiPour * \date (original) 21-Oct-2019 * @@ -21,6 +21,7 @@ import "qrc:/globals" import "qrc:/components" import "qrc:/pages/pretreatment" +import "qrc:/pages/pretreatment/create" import "qrc:/pages/treatment" import "qrc:/pages/posttreatment" @@ -33,14 +34,10 @@ StackItem { id : _root stackView.initialItem : _mainHome - MainHome { id: _mainHome - onTreatmentStarted : _root.page ( _treatmentStack ) - onTreatmentCreated : vTreatmentCreate.doSelectParameters() - } // Pre Treatment PreTreatmentCreateStack { id: _preTreatmentCreateStack } - PreTreatmentPrimeStack { id: _preTreatmentPrimeStack } + PreTreatmentMainStack { id: _preTreatmentMainStack } TreatmentStack { id: _treatmentStack // please be careful about the _root.pop. @@ -55,13 +52,18 @@ PostTreatmentRecirculateStack { id: _postTreatmentRecirculateStack } PostTreatmentEndStack { id: _postTreatmentEndStack } + MainHome { id: _mainHome + onTreatmentStarted : _root.page ( _treatmentStack ) + onTreatmentCreated : vTreatmentCreate.doSelectParameters() + } + Connections { target: vHDOperationMode onFaultChanged : { if ( vfault ) { /* this is one way navigation, no getting back or out */ }} onServiceChanged : { if ( vservice ) { /* this is one way navigation, no getting back or out */ }} onInitChanged : { if ( vinit ) { /* this is one way navigation, no getting back or out */ }} onStandbyChanged : { if ( vstandby ) { pop ( _mainHome )}} // this is a reset onValidateParametersChanged : { if ( vvalidateParameters) { page( _preTreatmentCreateStack )}} - onPreTreatmentChanged : { if ( vpreTreatment ) { page( _preTreatmentPrimeStack )}} + onPreTreatmentChanged : { if ( vpreTreatment ) { page( _preTreatmentMainStack )}} onInTreatmentChanged : { if ( vinTreatment ) { page( _treatmentStack )}} onPostTreatmentChanged : { if ( vpostTreatment ) { }} onInvalidModeChanged : { if ( vinvalidMode ) { }}