Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 -re2b8925fd32e359b3c440acd61e921f0be825a65 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) @@ -20,12 +20,6 @@ // Qml imports import "qrc:/globals" import "qrc:/components" -import "qrc:/pages/disinfect" -import "qrc:/pages/pretreatment" -import "qrc:/pages/pretreatment/create" -import "qrc:/pages/treatment" -import "qrc:/pages/endtreatment" -import "qrc:/pages/posttreatment" /*! * \brief ManagerStack is the screen @@ -74,8 +68,8 @@ ProgressBar { minimum : 0 - maximum : vHDPOSTData.itemCount - value : _GuiView.useLogUnhandledOnly ? maximum : vHDPOSTData.itemIndex + maximum : 0 //vHDPOSTData.itemCount + value : _GuiView.useLogUnhandledOnly ? maximum : 0 //vHDPOSTData.itemIndex width : _dialityLogo.width + 50 height : 3 progress.border.width: 0 @@ -101,8 +95,8 @@ visible : true // HD will pause for a few seconds before changing to stand-by mode // So we can show that POST has completed - fail : ! vHDPOSTData.doneResult - done : vHDPOSTData.done + fail : ! true //vHDPOSTData.doneResult + done : false //vHDPOSTData.done pause : ! _postModeScreen.visible } } @@ -120,57 +114,57 @@ } } - Connections { target: vTDOpMode - function onIsTreatmentChanged ( vValue ) { if( vValue ) _mainMenu.isTreatment() } - function onIsManagerChanged ( vValue ) { if( vValue ) _mainMenu.isManager () } - function onIsSettingsChanged ( vValue ) { if( vValue ) _mainMenu.isSettings () } +// Connections { target: vTDOpMode +// function onIsTreatmentChanged ( vValue ) { if( vValue ) _mainMenu.isTreatment() } +// function onIsManagerChanged ( vValue ) { if( vValue ) _mainMenu.isManager () } +// function onIsSettingsChanged ( vValue ) { if( vValue ) _mainMenu.isSettings () } - function onFaultChanged ( vValue ) { page( _startupScreen , vValue )} - function onServiceChanged ( vValue ) { page( _startupScreen , vValue )} - function onInitChanged ( vValue ) { page( _postModeScreen , vValue ) - if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run - } +// function onFaultChanged ( vValue ) { page( _startupScreen , vValue )} +// function onServiceChanged ( vValue ) { page( _startupScreen , vValue )} +// function onInitChanged ( vValue ) { page( _postModeScreen , vValue ) +// if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run +// } - function onHomeChanged ( vValue ) { page( _startupScreen , vValue )} - function onStandbyChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } - function onStandbyStartChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } - function onStandbyWaitTreatmentChanged ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel = false } - function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} +// function onHomeChanged ( vValue ) { page( _startupScreen , vValue )} +// function onStandbyChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } +// function onStandbyStartChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } +// function onStandbyWaitTreatmentChanged ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel = false } +// function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} - function onValidateParametersChanged ( vValue ) { _preTreatmentCreateStack.clear ( vValue ) // vValue == true if enterig the state ( clear only on entering). - page( _preTreatmentCreateStack , vValue )} - function onPreTreatmentChanged ( vValue ) { page( _preTreatmentStack , vValue )} - function onInTreatmentChanged ( vValue ) { page( _treatmentStack , vValue )} - function onPostTreatmentChanged ( vValue ) { page( _postTreatmentStack , vValue )} - function onInvalidModeChanged ( vValue ) { page( null , vValue )} - } +// function onValidateParametersChanged ( vValue ) { _preTreatmentCreateStack.clear ( vValue ) // vValue == true if enterig the state ( clear only on entering). +// page( _preTreatmentCreateStack , vValue )} +// function onPreTreatmentChanged ( vValue ) { page( _preTreatmentStack , vValue )} +// function onInTreatmentChanged ( vValue ) { page( _treatmentStack , vValue )} +// function onPostTreatmentChanged ( vValue ) { page( _postTreatmentStack , vValue )} +// function onInvalidModeChanged ( vValue ) { page( null , vValue )} +// } // the page function is more flixible regarding our current design // and it's easier(or may not need) to modify later if required. // 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 - // Blood Prime - function onBpRampChanged ( vValue ) { page( null , vValue )} +// Connections { target: vHDTreatmentStates +// // Blood Prime +// function onBpRampChanged ( vValue ) { page( null , vValue )} - // in-Treatmet - function onTxDialysisChanged ( vValue ) { page( _treatmentStack , vValue )} +// // in-Treatmet +// function onTxDialysisChanged ( vValue ) { page( _treatmentStack , vValue )} - function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} - function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} - function onTxEndChanged ( vValue ) { page( _endTreatmentEndStack , vValue )} +// function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} +// function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} +// function onTxEndChanged ( vValue ) { page( _endTreatmentEndStack , vValue )} - // Treatment Stop - function onTxStopChanged ( vValue ) { page( _treatmentStack , vValue )} - function onTsRecirculateChanged ( vValue ) { page( null , vValue )} - function onTsRecirculateDialysateChanged( vValue ) { page( null , vValue )} - function onTsRecirculateBloodChanged ( vValue ) { page( null , vValue )} - function onTsRecirculateNoChanged ( vValue ) { page( null , vValue )} - } +// // Treatment Stop +// function onTxStopChanged ( vValue ) { page( _treatmentStack , vValue )} +// function onTsRecirculateChanged ( vValue ) { page( null , vValue )} +// function onTsRecirculateDialysateChanged( vValue ) { page( null , vValue )} +// function onTsRecirculateBloodChanged ( vValue ) { page( null , vValue )} +// function onTsRecirculateNoChanged ( vValue ) { page( null , vValue )} +// } - Connections { target: vPreTreatmentAdjustmentInitTreatment - function onAdjustmentTriggered ( vValue ) { - _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText - } - } +// Connections { target: vPreTreatmentAdjustmentInitTreatment +// function onAdjustmentTriggered ( vValue ) { +// _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText +// } +// } }