Index: sources/gui/qml/main.qml =================================================================== diff -u -r8f336b528afb37743d4ae3404c810e6a9e4422c4 -rb238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5 --- sources/gui/qml/main.qml (.../main.qml) (revision 8f336b528afb37743d4ae3404c810e6a9e4422c4) +++ sources/gui/qml/main.qml (.../main.qml) (revision b238ed3e1aa94f5c03d4e1a6ed6c9fdfdd2a3cb5) @@ -50,7 +50,6 @@ import VPreTreatmentStates 0.1 import VHDTreatmentStates 0.1 import VPostTreatmentStates 0.1 -import VDisinfectStates 0.1 // Treatment - Common import VTreatmentVitals 0.1 @@ -110,8 +109,6 @@ import VPostTreatmentAdjustmentTreatmentLog 0.1 // Disinfection import VDisinfectAdjustDisinfect 0.1 -import VDisinfectAdjustChemicalConfirm 0.1 -import VDisinfectDGData 0.1 // Qml imports import "qrc:/globals" @@ -146,11 +143,21 @@ VPreTreatmentStates { id: vPreTreatmentStates } VHDTreatmentStates { id: vHDTreatmentStates } VPostTreatmentStates { id: vPostTreatmentStates } - VDisinfectStates { id: vDisinfectStates } VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentVitals { id: vTreatmentVitals interval : vTreatmentCreate.bloodPressureMeasureInterval + enableDialog: vHDOperationMode.inTreatment && vHDTreatmentStates.txDialysis + // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. + onEnableDialogChanged : { + if ( vTreatmentVitals.enableDialog ) { + vTreatmentVitals.doTimerStart() + } + else { + vTreatmentVitals.doTimerStop() + vTreatmentVitals.doReset() + } + } } VGeneralEvent { id: vGeneralEvent } @@ -218,8 +225,6 @@ // --- Disinfection VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } - VDisinfectAdjustChemicalConfirm { id: vDisinfectAdjustChemicalConfirm } - VDisinfectDGData { id: vDisinfectDGData } Background {} @@ -253,6 +258,9 @@ } } + Connections { target: vHDOperationMode + onStandbyWaitDisinfectChanged : { _mainMenu.isTreatment() } + } // 9 - Others Text { // TEST : Application version should be moved into the information screen later. @@ -359,7 +367,8 @@ anchors.bottom : _mainMenu.top backgroundColor : _alarmItem.backgroundColor textColor : _alarmItem.textColor - text : _alarmItem.message + text : _alarmItem.title + textPixelSize : Fonts.fontPixelAlarmBarTitle isSilenced : _alarmItem.isSilenced timeout : _alarmItem.timeout backgroundFading : vHDOperationMode.fault