Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -36,7 +36,7 @@ StackItem { id : _root // DEBUG: this property can mostly be used for debugging to get pass the initial screen - property var initialItem: _initialModeScreen // _mainHome + property var initialItem: _postModeScreen // _mainHome stackView.initialItem : _root.initialItem @@ -73,14 +73,11 @@ onVisibleChanged: if (visible) _mainMenu.hidden = true } - ScreenItem { id: _initialModeScreen - onVisibleChanged: - if (visible) { - _mainMenu.hidden = true - } + ScreenItem { id: _postModeScreen + onVisibleChanged: if (visible) _mainMenu.hidden = true Image { id: _dialityLogo Behavior on opacity { OpacityAnimator { duration: 1000 } } - opacity : _initialModeScreen.visible ? 1 : 0 + opacity : _postModeScreen.visible ? 1 : 0 anchors.centerIn: parent source : "qrc:/images/iLogoDiality" } @@ -113,7 +110,7 @@ // So we can show that POST has completed fail : ! vHDPOSTData.doneResult done : vHDPOSTData.done - pause : ! _initialModeScreen.visible + pause : ! _postModeScreen.visible } } @@ -128,9 +125,13 @@ } Connections { target: vHDOperationMode - // onFaultChanged : { page( _faultModeScreen , vfault )} // may needed later. + onIsTreatmentChanged : { if( visTreatment ) _mainMenu.isTreatment() } + onIsManagerChanged : { if( visManager ) _mainMenu.isManager () } + onIsSettingsChanged : { if( visSettings ) _mainMenu.isSettings () } + + onFaultChanged : { page( _faultModeScreen , vfault )} onServiceChanged : { page( _serviceModeScreen , vservice )} - onInitChanged : { page( _root.initialItem , vinit ) + onInitChanged : { page( _postModeScreen , vinit ) if ( vinit ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run } @@ -147,6 +148,20 @@ onInvalidModeChanged : { page( null , vinvalidMode )} } + // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. + Connections { target: vHDOperationMode + onInTreatmentChanged : { + vTreatmentVitals.enableDialog = vinTreatment + if ( vinTreatment ) { + vTreatmentVitals.doTimerStart() + } + else { + vTreatmentVitals.doTimerStop() + vTreatmentVitals.doReset() + } + } + } + // 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