Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rb59827b661a423b2b1ad2ca7b8611c2c0be7bd6a --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision b59827b661a423b2b1ad2ca7b8611c2c0be7bd6a) @@ -22,39 +22,55 @@ import "qrc:/components" import "qrc:/pages/pretreatment" import "qrc:/pages/pretreatment/connection" +import "qrc:/pages/pretreatment/create" + /*! * \brief the pre treatment prime stack screen */ StackItem { id: _root objectName: "_PreTreatmentStack" - stackView.initialItem : null + stackView.initialItem : _pretreatmentInstallation + enum StackStepIndex { + Installation , + SelfTests , + Saline , + Prime , + CreateRx , + UF , + Connect + } - property int stackStepIndex : 0 +// PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack ;objectName: "_preTreatmentWaterSampleStack" } +// PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack ;objectName: "_preTreatmentConsumablesStack" } +// PreTreatmentPrimeStack { id: _pretreatmentPrimeStack ;objectName: "_pretreatmentPrimeStack" } +// PreTreatmentConnectionStack { id: _pretreatmentConnectionStack ;objectName: "_pretreatmentConnectionStack " } + PreTreatmentInstallation { id: _pretreatmentInstallation } - PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack ;objectName: "_preTreatmentWaterSampleStack" } - PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack ;objectName: "_preTreatmentConsumablesStack" } - PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack ;objectName: "_preTreatmentDisposablesStack" } - PreTreatmentPrimeStack { id: _pretreatmentPrimeStack ;objectName: "_pretreatmentPrimeStack" } - PreTreatmentConnectionStack { id: _pretreatmentConnectionStack ;objectName: "_pretreatmentConnectionStack " } + PreTreatmentCreate { id: _pretreatmentCreate ; } - Connections { target: vPreTreatmentStates - function onWaterSampleChanged ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )} - function onSelfTestConsumablesChanged ( vValue ) { page( _preTreatmentConsumablesStack , vValue )} - function onSelfTestNoCartridgeChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} - function onInstallationChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} // DEBUG: Experimental : console.debug("vinstallation " - function onSelfTestDryChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} - function onPrimeChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vprime " - function onRecirculateChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vrecirculate " - function onPatientConnectionChanged ( vValue ) { page( _pretreatmentConnectionStack , vValue )} - } + function clear(vValue) { if ( ! vValue ) return; _pretreatmentCreate.clear(vValue) } + +// Connections { target: vPreTreatmentStates +// function onWaterSampleChanged ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )} +// function onSelfTestConsumablesChanged ( vValue ) { page( _preTreatmentConsumablesStack , vValue )} +// function onSelfTestNoCartridgeChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} +// function onInstallationChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} // DEBUG: Experimental : console.debug("vinstallation " +// function onSelfTestDryChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} +// function onPrimeChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vprime " +// function onRecirculateChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vrecirculate " +// function onPatientConnectionChanged ( vValue ) { page( _pretreatmentConnectionStack , vValue )} +// } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true + _headerBar.titleText = qsTr("Setup Treatment") } else { stackView.initialItem = null + _headerBar.titleText = "" } } }