Index: sources/gui/qml/main.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rc6a08131766a8f9db5f38266b7323dbca8022baf --- sources/gui/qml/main.qml (.../main.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/main.qml (.../main.qml) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -31,13 +31,16 @@ import VAlarmStatus 0.1; import VPowerOff 0.1; import VHDOperationMode 0.1; +import VHDAccelerometer 0.1; import VTreatmentAdjustmentDuration 0.1; import VTreatmentAdjustmentFlows 0.1; import VTreatmentAdjustmentUltrafiltrationState 0.1; import VTreatmentAdjustmentUltrafiltrationEdit 0.1; import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; +import VTreatmentAdjustmentVersions 0.1; + import VDGDrainPump 0.1; import VDGHeaters 0.1; import VDGLoadCellReadings 0.1; @@ -47,6 +50,7 @@ import VDGReservoir 0.1; import VDGTemperatures 0.1; import VDGValvesStates 0.1; +import VDGAccelerometer 0.1; // Qml imports import "qrc:/globals" @@ -109,6 +113,7 @@ VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } + VHDAccelerometer { id: vHDAccelerometer } VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -119,13 +124,16 @@ VDGReservoir { id: vDGReservoir } VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } + VDGAccelerometer { id: vDGAccelerometer } VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } + VTreatmentAdjustmentVersions { id: vTreatmentAdjustmentVersions } + // ----- Follow the below Z order ----- // 1 - Screens // 1 - 1 @@ -161,7 +169,6 @@ } NotificationBar { id: _alarm_bar - anchors.bottom: _mainMenu.top level : vAlarmStatus.alarm_Priority text : vAlarmStatus.text; @@ -173,8 +180,6 @@ _alarm_bar.visible = false; _alarm_dialog.visible = true; } - - } function isAlarmHighPriority() { @@ -204,7 +209,6 @@ } _alarm_bar.setFlashing(false); } - onClickedSilence: { _alarm_dialog.visible = false; vAlarmStatus.requestSilence(); @@ -264,10 +268,8 @@ default : // GuiActions.ALARM_PRIORITY_NONE root_color = Colors.textNotificationNoneBg; text_color = Colors.textNotificationNoneFg; - } return [root_color, text_color]; - } function getAlarmTopBarColors(level) { @@ -311,7 +313,6 @@ 2000 // notifies user and hides the dialog ) break; - } } }