Index: sources/gui/qml/main.qml =================================================================== diff -u -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 -r54aae98b72e3804008acad0bbbb7573be8e35707 --- sources/gui/qml/main.qml (.../main.qml) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) +++ sources/gui/qml/main.qml (.../main.qml) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) @@ -23,31 +23,35 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the TreatmentFlows.qml -import VTreatmentBloodFlow 0.1 -import VTreatmentDialysateFlow 0.1 -import VTreatmentPressureOcclusion 0.1 -import VTreatmentUltrafiltration 0.1 -import VTreatmentTime 0.1 -import VAlarmStatus 0.1 -import VPowerOff 0.1 -import VHDOperationMode 0.1 +import VTreatmentBloodFlow 0.1; +import VTreatmentDialysateFlow 0.1; +import VTreatmentPressureOcclusion 0.1; +import VTreatmentUltrafiltration 0.1; +import VTreatmentTime 0.1; +import VAlarmStatus 0.1; +import VPowerOff 0.1; +import VHDOperationMode 0.1; -import VTreatmentAdjustmentDuration 0.1 -import VTreatmentAdjustmentFlows 0.1 +import VTreatmentAdjustmentDuration 0.1; +import VTreatmentAdjustmentFlows 0.1; -import VTreatmentCreate 0.1 -import VDGDrainPump 0.1 -import VDGHeaters 0.1 -import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 -import VDGPressures 0.1 -import VDGROPump 0.1 -import VDGReservoir 0.1 -import VDGTemperatures 0.1 -import VDGValvesStates 0.1 -import VPriming 0.1 -import VTreatmentBegin 0.1 -import VTreatmentEnd 0.1 +import VTreatmentCreate 0.1; +import VBluetooth 0.1; +import VDGDrainPump 0.1; +import VDGHeaters 0.1; +import VDGLoadCellReadings 0.1; +import VDGOperationMode 0.1; +import VDGPressures 0.1; +import VDGROPump 0.1; +import VDGReservoir 0.1; +import VDGTemperatures 0.1; +import VDGValvesStates 0.1; +import VPriming 0.1; +import VTreatmentBegin 0.1; +import VTreatmentEnd 0.1; +import VTreatmentAdjustmentUltrafiltrationInit 0.1; +import VVitals 0.1; +import VAlert 0.1; // Qml imports import "qrc:/globals" @@ -103,9 +107,13 @@ VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } + VBluetooth { id: vBluetooth } VPriming { id: vPriming } VTreatmentBegin { id: vTreatmentBegin } VTreatmentEnd { id: vTreatmentEnd } + VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } + VVitals { id: vVitals } + VAlert { id: vAlert } // ----- Follow the below Z order ----- // 1 - Screens @@ -272,6 +280,8 @@ } } + Alert { id: _alert } + Connections { target: vAlarmStatus onAlarm_Flag_noResumeChanged : vAlarmStatus.alarm_KeepMinimized = false onAlarm_Flag_noRinsebackChanged : vAlarmStatus.alarm_KeepMinimized = false