Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -rb59827b661a423b2b1ad2ca7b8611c2c0be7bd6a -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision b59827b661a423b2b1ad2ca7b8611c2c0be7bd6a) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa) @@ -20,18 +20,16 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" import "qrc:/pages/pretreatment" -import "qrc:/pages/pretreatment/connection" import "qrc:/pages/pretreatment/create" /*! - * \brief the pre treatment prime stack screen + * \brief the pre treatment stack screen */ StackItem { id: _root - objectName: "_PreTreatmentStack" - stackView.initialItem : _pretreatmentInstallation - enum StackStepIndex { + enum StackStep { Installation , SelfTests , Saline , @@ -41,17 +39,130 @@ Connect } + property var stepNames: [ + qsTr("Installation" ), + qsTr("Self-Tests" ), + qsTr("Saline" ), + qsTr("Prime" ), + qsTr("Rx" ), + qsTr("UF" ), + qsTr("Connect" ), + ] + + property int stepLineLength : 100 + property int stackStepIndex : 0 + + onVisibleChanged: { + if (visible) { + _mainMenu.hidden = true + _headerBar.titleText = qsTr("Setup Treatment") + _root.stackStepIndex = 0 + } + else { + stackView.initialItem = null + _headerBar.titleText = "" + } + } + + function clear(vValue) { if ( ! vValue ) return; _pretreatmentCreate.clear(vValue) } + + function confirmClicked() { + switch ( _root.stackStepIndex ) { + case PreTreatmentStack.Installation: + page ( _pretreatmentCreate ) // TODO FIX ME IN PRE TREATMENT + break + case PreTreatmentStack.SelfTests: + break + case PreTreatmentStack.Saline: + break + case PreTreatmentStack.Prime: + break + case PreTreatmentStack.CreateRx: + _pretreatmentCreate.confirmButtonClicked() + break + case PreTreatmentStack.UF: + break + case PreTreatmentStack.Connect: + break + default: + break + } + } + + function backClicked() { + switch ( _root.stackStepIndex ) { + case PreTreatmentStack.Installation: + vPreTreatmentAdjustmentInitTreatment.doCancel() // request standby + break + case PreTreatmentStack.SelfTests: + break + case PreTreatmentStack.Saline: + break + case PreTreatmentStack.Prime: + break + case PreTreatmentStack.CreateRx: + page ( _pretreatmentInstallation ) // TODO FIX ME IN PRE TREATMENT + break + case PreTreatmentStack.UF: + break + case PreTreatmentStack.Connect: + break + default: + break + } + } + + function confirmButtonText() { + switch ( _root.stackStepIndex ) { + case PreTreatmentStack.Installation: + return qsTr("Auto-Load") + case PreTreatmentStack.CreateRx: + return vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") : + qsTr("VALIDATE"); + default: + return qsTr("CONFIRM") + } + } + + StepNavigationTitleBar { id: _titleBar + stepIndex : _root.stackStepIndex + anchors { + top : _root.top + left : parent.left + right : parent.right + leftMargin : Variables.defaultMargin * 2 + rightMargin : anchors.leftMargin + } + confirmText.text: confirmButtonText() + confirmVisible : true + confirmEnabled : _root.stackStepIndex === PreTreatmentStack.CreateRx ? _pretreatmentCreate.confirmReady() : true + backVisible : _root.stackStepIndex === PreTreatmentStack.CreateRx ? ! vTreatmentCreate.parametersValidated : true + width : _root.width + stepNames : _root.stepNames + onBackClicked : _root.backClicked() + onConfirmClicked: _root.confirmClicked() + } + + // TODO in pre treatment story // PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack ;objectName: "_preTreatmentWaterSampleStack" } // PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack ;objectName: "_preTreatmentConsumablesStack" } // PreTreatmentPrimeStack { id: _pretreatmentPrimeStack ;objectName: "_pretreatmentPrimeStack" } // PreTreatmentConnectionStack { id: _pretreatmentConnectionStack ;objectName: "_pretreatmentConnectionStack " } PreTreatmentInstallation { id: _pretreatmentInstallation } + PreTreatmentCreate { id: _pretreatmentCreate } - PreTreatmentCreate { id: _pretreatmentCreate ; } + Connections { target: vPreTreatmentAdjustmentDisposablesConfirm + function onAdjustmentTriggered ( vValue ) { + if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) { + _pretreatmentInstallation.informationText = "" + page ( _pretreatmentCreate ) // TODO fix in pre treatment.. Skip to create for now + } else { + _pretreatmentInstallation.informationText = vPreTreatmentAdjustmentDisposablesConfirm.text() + } + } + } - function clear(vValue) { if ( ! vValue ) return; _pretreatmentCreate.clear(vValue) } - - + // TODO in pre treatment story // Connections { target: vPreTreatmentStates // function onWaterSampleChanged ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )} // function onSelfTestConsumablesChanged ( vValue ) { page( _preTreatmentConsumablesStack , vValue )} @@ -62,15 +173,4 @@ // 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 = "" - } - } }