Index: denali.pro.user =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- denali.pro.user (.../denali.pro.user) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ denali.pro.user (.../denali.pro.user) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/components/PlaceHolderText.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/components/PlaceHolderText.qml (.../PlaceHolderText.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/components/PlaceHolderText.qml (.../PlaceHolderText.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -25,12 +25,13 @@ */ Item { property string screenName: "" + anchors.centerIn: parent Column { spacing: Variables.columnSpacing anchors.centerIn: parent TitleText { id: _titleText width: parent.width - text: screenName + qsTr(" Placeholder") + text: screenName } } } Index: sources/gui/qml/components/StackItem.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -33,7 +33,9 @@ /*! * \brief prints out the list of the items in the stack by their index position in the stack. */ - function info() { + function info(vInfo) { + console.debug('-----') + if ( vInfo !== undefined ) console.debug(vInfo) for( var i = 0; i < _stackView.depth; i++ ) { console.debug("index:", i, _stackView.get(i)) } @@ -44,8 +46,15 @@ * \brief page function gets the screen vScreen and tries to find the screen in the stack. * if the page found will pop the items on stack down to that screen. * otherwise adds that screen on top of the stack + * \param vScreen - The screen to navigate to + * \param vCondition - if the vCondition has been passed and is false then page returns immediately + * \param vInfo - some extra information to be shown in the info function if the screen name is the same + * */ - function page(vScreen) { + function page(vScreen, vCondition, vInfo) { + if ( vScreen === undefined || vScreen === null ) return + if ( vCondition !== undefined && vCondition === false ) return + if (stackView.find(function(screen) { return screen === vScreen; })) { @@ -54,7 +63,7 @@ else { _stackView.push(vScreen) } - info() + info(vInfo) } /*! Index: sources/gui/qml/pages/MainHome.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -27,6 +27,8 @@ * which is the default screen in the "Treatment" stack */ ScreenItem { id: _root + objectName: "_MainHome" + signal treatmentStarted() signal treatmentCreated() Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -52,21 +52,34 @@ PostTreatmentRecirculateStack { id: _postTreatmentRecirculateStack } PostTreatmentEndStack { id: _postTreatmentEndStack } + + ScreenItem { id: _faultModeScreen + PlaceHolderText { screenName: qsTr("FAULT MODE") } + } + + ScreenItem { id: _serviceModeScreen + PlaceHolderText { screenName: qsTr("SERVICE MODE") } + } + + ScreenItem { id: _InitialModeScreen + PlaceHolderText { screenName: qsTr("INITIAL MODE") } + } + MainHome { id: _mainHome - onTreatmentStarted : _root.page ( _treatmentStack ) - onTreatmentCreated : vPreTreatmentAdjustmentInitTreatment.doInitiate() + onTreatmentStarted : { page( _treatmentStack )} + onTreatmentCreated : { vPreTreatmentAdjustmentInitTreatment.doInitiate() } } 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 ) { page( _mainHome )}} - onValidateParametersChanged : { if ( vvalidateParameters) { page( _preTreatmentCreateStack )}} - onPreTreatmentChanged : { if ( vpreTreatment ) { page( _preTreatmentMainStack )}} - onInTreatmentChanged : { if ( vinTreatment ) { page( _treatmentStack )}} - onPostTreatmentChanged : { if ( vpostTreatment ) { }} - onInvalidModeChanged : { if ( vinvalidMode ) { }} + onFaultChanged : { page( _faultModeScreen , vfault )} + onServiceChanged : { page( _serviceModeScreen , vservice )} + onInitChanged : { page( _InitialModeScreen , vinit )} + onStandbyChanged : { page( _mainHome , vstandby )} + onValidateParametersChanged : { page( _preTreatmentCreateStack , vvalidateParameters )} + onPreTreatmentChanged : { page( _preTreatmentMainStack , vpreTreatment )} + onInTreatmentChanged : { page( _treatmentStack , vinTreatment )} + onPostTreatmentChanged : { page( null , vpostTreatment )} + onInvalidModeChanged : { page( null , vinvalidMode )} } @@ -76,20 +89,20 @@ // also with what ever order they have been push with the reverse/correct animation will be poped or pushed. Connections { target: vHDTreatmentStates // Blood Prime - onTxBloodPrimeChanged : { if ( vtxBloodPrime ) { page( _postTreatmentBloodPrime )}} - onBpRampChanged : { if ( vbpRamp ) { /* No action defined yet */ }} + onTxBloodPrimeChanged : { page( _postTreatmentBloodPrime , vtxBloodPrime )} + onBpRampChanged : { page( null , vbpRamp )} // in-Treatmet - onTxDialysisChanged : { if ( vtxDialysis ) { page( _treatmentStack )}} + onTxDialysisChanged : { page( _treatmentStack , vtxDialysis )} - onTxRinsebackChanged : { if ( vtxRinseback ) { page( _postTreatmentRinsebackStack )}} - onTxRecirculateChanged : { if ( vtxRecirculate ) { page( _postTreatmentRecirculateStack )}} - onTxEndChanged : { if ( vtxEnd ) { page( _postTreatmentEndStack )}} + onTxRinsebackChanged : { page( _postTreatmentRinsebackStack , vtxRinseback )} + onTxRecirculateChanged : { page( _postTreatmentRecirculateStack , vtxRecirculate )} + onTxEndChanged : { page( _postTreatmentEndStack , vtxEnd )} // Treatment Stop - onTxStopChanged : { if ( vtxStop ) { page( _treatmentStack )}} - onTsRecirculateChanged : { if ( vtsRecirculate ) { /* No action defined yet */ }} - onTsRecirculateNoChanged: { if ( vtsRecirculateNo ) { /* No action defined yet */ }} + onTxStopChanged : { page( _treatmentStack , vtxStop )} + onTsRecirculateChanged : { page( null , vtsRecirculate )} + onTsRecirculateNoChanged : { page( null , vtsRecirculateNo )} } onVisibleChanged: { Index: sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml (.../PostTreatmentEndStack.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml (.../PostTreatmentEndStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -36,8 +36,8 @@ PostTreatmentEndPaused { id: _postTreatmentEndPaused } Connections { target: vHDTreatmentStates - onTeWaitRinsebackChanged: { if ( vteWaitRinseback ) { page( _postTreatmentEnd )}} - onTePausedChanged : { if ( vtePaused ) { page( _postTreatmentEndPaused )}} + onTeWaitRinsebackChanged: { page( _postTreatmentEnd , vteWaitRinseback )} + onTePausedChanged : { page( _postTreatmentEndPaused , vtePaused )} } Connections { target: vTreatmentAdjustmentEnd Index: sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml (.../PostTreatmentRecirculateStack.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml (.../PostTreatmentRecirculateStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -40,8 +40,8 @@ } Connections { target: vHDTreatmentStates - onRcStartedChanged : { if ( vrcStarted ) { page( _postTreatmentRecirculate )}} - onRcStoppedChanged : { if ( vrcStopped ) { page( _postTreatmentReconnect )}} + onRcStartedChanged : { page( _postTreatmentRecirculate , vrcStarted )} + onRcStoppedChanged : { page( _postTreatmentReconnect , vrcStopped )} } Connections { target: vTreatmentAdjustmentRecirculate Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml =================================================================== diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -51,11 +51,11 @@ PostTreatmentAdditional { id: _postTreatmentAdditional } Connections { target: vHDTreatmentStates - onRbInitChanged : { if ( vrbInit ) { page( _postTreatmentRinsebackInit )}} - onRbRunChanged : { if ( vrbRun ) { page( _postTreatmentRinseback )}} - onRbPausedChanged : { if ( vrbPaused ) { page( _postTreatmentRinseback )}} - onRbStopChanged : { if ( vrbStop ) { page( _postTreatmentRinsebackComplete )}} - onRbAdditionalChanged : { if ( vrbAdditional ) { page( _postTreatmentAdditional )}} + onRbInitChanged : { page( _postTreatmentRinsebackInit , vrbInit )} + onRbRunChanged : { page( _postTreatmentRinseback , vrbRun )} + onRbPausedChanged : { page( _postTreatmentRinseback , vrbPaused )} + onRbStopChanged : { page( _postTreatmentRinsebackComplete , vrbStop )} + onRbAdditionalChanged : { page( _postTreatmentAdditional , vrbAdditional )} } Connections { target: vTreatmentAdjustmentRinseback Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -55,8 +55,8 @@ } Connections { target: vPreTreatmentStates - onSelfTestConsumables_installChanged : { if ( vselfTestConsumables_install ) page( _preTreatmentConsumablesInstall )} - // onSelfTestConsumables_waterQualityEntered : { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vselfTestConsumables_waterQuality )} + onSelfTestConsumables_installChanged : { page( _preTreatmentConsumablesInstall , vselfTestConsumables_install )} + onSelfTestConsumables_waterQualityEntered : {/*_preTreatmentConsumablesSelfTest.checkList.setItem( 0, vselfTestConsumables_waterQuality)*/} onSelfTestConsumables_biCarbPumpEntered : { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vselfTestConsumables_biCarbPump )} onSelfTestConsumables_acidPumpEntered : { _preTreatmentConsumablesSelfTest.checkList.setItem( 1, vselfTestConsumables_acidPump )} } Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -88,10 +88,10 @@ } Connections { target: vPreTreatmentStates - onSelfTestNoCartridge_startChanged : { if ( vselfTestNoCartridge_start ) { }} + onSelfTestNoCartridge_startChanged : { /* , vselfTestNoCartridge_start */ } // FW doesn't go all the time to start so the main state change should be sufficient to update the disposables stack. - onSelfTestNoCartridgeChanged : { if ( vselfTestNoCartridge ) page( _preTreatmentDisposablesSelfTest )} - onInstallationChanged : { if ( vinstallation ) page( _preTreatmentDisposablesCartridgeInstallation )} + onSelfTestNoCartridgeChanged : { page( _preTreatmentDisposablesSelfTest , vselfTestNoCartridge )} + onInstallationChanged : { page( _preTreatmentDisposablesCartridgeInstallation , vinstallation )} } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml (.../PreTreatmentMainStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml (.../PreTreatmentMainStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -50,14 +50,14 @@ Connections { target: vPreTreatmentStates onStartChanged : {} - onWaterSampleChanged : { if ( vwaterSample ) { page( _preTreatmentWaterSampleStack )}} - onSelfTestConsumablesChanged: { if ( vselfTestConsumables ) { page( _preTreatmentConsumablesStack )}} - onSelfTestNoCartridgeChanged: { if ( vselfTestNoCartridge ) { page( _preTreatmentDisposablesStack )}} - onInstallationChanged : { if ( vinstallation ) { console.debug("vinstallation ")}} - onSelfTestDryChanged : { if ( vselfTestDry ) { page( _pretreatmentPrimeStack )}} - onPrimeChanged : { if ( vprime ) { console.debug("vprime ")}} - onRecirculateChanged : { if ( vrecirculate ) { console.debug("vrecirculate ")}} - onPatientConnectionChanged : { if ( vpatientConnection ) { page( _pretreatmentConnectionStack )}} + onWaterSampleChanged : { page( _preTreatmentWaterSampleStack , vwaterSample )} + onSelfTestConsumablesChanged: { page( _preTreatmentConsumablesStack , vselfTestConsumables )} + onSelfTestNoCartridgeChanged: { page( _preTreatmentDisposablesStack , vselfTestNoCartridge )} + onInstallationChanged : { console.debug("vinstallation ", vinstallation )} + onSelfTestDryChanged : { page( _pretreatmentPrimeStack , vselfTestDry )} + onPrimeChanged : { console.debug("vprime ", vprime )} + onRecirculateChanged : { console.debug("vrecirculate ", vrecirculate )} + onPatientConnectionChanged : { page( _pretreatmentConnectionStack , vpatientConnection )} } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -99,29 +99,29 @@ } Connections { target: vPreTreatmentStates - onSelfTestDryChanged : { if ( vselfTestDry ) { page( _preTreatmentDrySelfTest )}} + onSelfTestDryChanged : { page( _preTreatmentDrySelfTest , vselfTestDry )} onSelfTestDry_startChanged : {} onSelfTestDry_waitDoorCloseChanged : {} - onSelfTestDry_usedCartridgeEntered : { _preTreatmentDrySelfTest.checkList.setItem( 0, vselfTestDry_usedCartridge )} - onSelfTestDry_occlusionSensorsEntered : { _preTreatmentDrySelfTest.checkList.setItem( 1, vselfTestDry_occlusionSensors )} - onSelfTestDry_pressureSensorsSetupEntered : { _preTreatmentDrySelfTest.checkList.setItem( 2, true )} + onSelfTestDry_usedCartridgeEntered : { _preTreatmentDrySelfTest .checkList.setItem(0, vselfTestDry_usedCartridge )} + onSelfTestDry_occlusionSensorsEntered : { _preTreatmentDrySelfTest .checkList.setItem(1, vselfTestDry_occlusionSensors )} + onSelfTestDry_pressureSensorsSetupEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, true )} onSelfTestDry_pressureSensorsEntered : {} - onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest.checkList.setItem( 2, vselfTestDry_pressureSensorsNormal )} + onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest .checkList.setItem(2, vselfTestDry_pressureSensorsNormal )} onSelfTestDry_stoppedEntered : {} onSelfTestDry_completeEntered : {} } Connections { target: vPreTreatmentStates - onPrimeChanged : { if ( vprime ) { page( _preTreatmentDisposablesPrime )}} + onPrimeChanged : { page( _preTreatmentDisposablesPrime , vprime )} onPrime_waitUserStartEntered : {} - onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime.checkList.setItem(0, true )} + onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, true )} onPrime_salinePurgeAirEntered : {} - onPrime_salineCirculateBloodCircuitEntered : { _preTreatmentDisposablesPrime.checkList.setItem(0, vprime_salineCirculateBloodCircuit )} - onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime.checkList.setItem(1, true )} + onPrime_salineCirculateBloodCircuitEntered : { _preTreatmentDisposablesPrime .checkList.setItem(0, vprime_salineCirculateBloodCircuit )} + onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, true )} onPrime_dialysateDialyzerEntered : {} onPrime_reservoirTwoFillCompleteEntered : {} - onPrime_dialysateBypassEntered : { _preTreatmentDisposablesPrime.checkList.setItem(1, vprime_dialysateBypass )} - onPrime_wetSelfTestsEntered : { _preTreatmentDisposablesPrime.checkList.setItem(2, vprime_wetSelfTests )} + onPrime_dialysateBypassEntered : { _preTreatmentDisposablesPrime .checkList.setItem(1, vprime_dialysateBypass )} + onPrime_wetSelfTestsEntered : { _preTreatmentDisposablesPrime .checkList.setItem(2, vprime_wetSelfTests )} onPrime_pauseEntered : {} onPrime_completeEntered : {} } Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -36,7 +36,7 @@ signal sampleReleased() signal passClicked () signal failClicked () - signal endTreatmentClicked + signal okClicked () // ----- Screens definitions PreTreatmentBase { id: _preTreatmentFilterFlush @@ -94,33 +94,32 @@ footer.children: [ TouchRect { width: parent.spacing - text.text: qsTr("END TREATMENT") - onClicked: _root.endTreatmentClicked() + text.text: qsTr("OK") + onClicked: _root.okClicked() } ] } // ----- Screens Navigations Connections { target: vPreTreatmentStates - onWaterSample_setupChanged : { if ( vwaterSample_setup ) { page( _preTreatmentFilterFlush )}} - onWaterSample_runningChanged: { if ( vwaterSample_running ) { page( _preTreatmentWaterSample )}} + onWaterSample_setupChanged : { page( _preTreatmentFilterFlush , vwaterSample_setup )} + onWaterSample_runningChanged: { page( _preTreatmentWaterSample , vwaterSample_running )} } // ----- Screen Actions/Navigations Connections { target: _preTreatmentWaterSample - onConfirmClicked : { page( _preTreatmentWaterSampleResult )} + onConfirmClicked : { page( _preTreatmentWaterSampleResult )} } Connections { target: _preTreatmentWaterSampleResult - onBackClicked : { page( _preTreatmentWaterSample )} + onBackClicked : { page( _preTreatmentWaterSample )} } - onSamplePressed : { vPreTreatmentAdjustmentWaterSample.doSample( true )} - onSampleReleased : { vPreTreatmentAdjustmentWaterSample.doSample( false )} - onPassClicked : { vPreTreatmentAdjustmentWaterSample.doResult( true )} - onFailClicked : { vPreTreatmentAdjustmentWaterSample.doResult( false ) - page( _preTreatmentWaterSampleResultFail )} - onEndTreatmentClicked : { } + onSamplePressed : { vPreTreatmentAdjustmentWaterSample.doSample( true )} + onSampleReleased : { vPreTreatmentAdjustmentWaterSample.doSample( false )} + onPassClicked : { vPreTreatmentAdjustmentWaterSample.doResult( true )} + onFailClicked : { page( _preTreatmentWaterSampleResultFail )} + onOkClicked : { vPreTreatmentAdjustmentWaterSample.doResult( false )} Connections { target: vPreTreatmentAdjustmentWaterSample onAdjustmentTriggered : { Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -61,7 +61,7 @@ } Connections { target: vPreTreatmentStates - onPatientConnectionChanged : { if ( vpatientConnection ) { page( _preTreatmentUltrafiltration )}} + onPatientConnectionChanged : { page( _preTreatmentUltrafiltration , vpatientConnection )} } Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608) @@ -45,27 +45,27 @@ header.confirmVisible : true title.text : qsTr("Confirm Treatment") - onBackClicked : { vTreatmentCreate.doCancelConfirmParameters() } - onConfirmClicked : { vTreatmentCreate.doFinishedConfirm() } + onBackClicked : { vTreatmentCreate.doCancelConfirmParameters ()} + onConfirmClicked : { vTreatmentCreate.doFinishedConfirm ()} } Connections { target: vHDOperationMode - onValidateParametersChanged : { if ( vvalidateParameters) { page( _pretreatmentCreate )}} + onValidateParametersChanged : { page( _pretreatmentCreate , vvalidateParameters )} } Connections { target: vTreatmentCreate - onFwValidationSuccess : { push( _pretreatmentConfirm )} + onFwValidationSuccess : { page( _pretreatmentConfirm )} } Connections { target: _pretreatmentCreate - onBackClicked : { vTreatmentCreate.doCancelSelectingParameters()} - onConfirmClicked : { vTreatmentCreate.doFinishedCreate() } + onBackClicked : { vTreatmentCreate.doCancelSelectingParameters ()} + onConfirmClicked : { vTreatmentCreate.doFinishedCreate ()} } Connections { target: _pretreatmentConfirm - onBackClicked : { vTreatmentCreate.doCancelConfirmParameters() - page( _pretreatmentCreate )} - onConfirmClicked : { vTreatmentCreate.doFinishedConfirm() } + onBackClicked : { vTreatmentCreate.doCancelConfirmParameters () + page( _pretreatmentCreate )} + onConfirmClicked : { vTreatmentCreate.doFinishedConfirm ()} } onVisibleChanged: {