Index: sources/gui/qml/main.qml =================================================================== diff -u -r84c5373209a1a488c00917995f5553d442d159a4 -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac --- sources/gui/qml/main.qml (.../main.qml) (revision 84c5373209a1a488c00917995f5553d442d159a4) +++ sources/gui/qml/main.qml (.../main.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file main.qml - * \author (last) Behrouz NematiPour - * \date (last) 25-Aug-2020 + * \author (last) Peter Lucia + * \date (last) 15-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * @@ -38,6 +38,7 @@ import VTreatmentAdjustmentUltrafiltrationEdit 0.1; import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; +import VCreateTreatment 0.1; import VDGDrainPump 0.1; import VDGHeaters 0.1; import VDGLoadCellReadings 0.1; @@ -125,6 +126,7 @@ VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } + VCreateTreatment { id: vCreateTreatment } // ----- Follow the below Z order ----- // 1 - Screens @@ -173,8 +175,6 @@ _alarm_bar.visible = false; _alarm_dialog.visible = true; } - - } function isAlarmHighPriority() { @@ -264,10 +264,8 @@ default : // GuiActions.ALARM_PRIORITY_NONE root_color = Colors.textNotificationNoneBg; text_color = Colors.textNotificationNoneFg; - } return [root_color, text_color]; - } function getAlarmTopBarColors(level) { @@ -289,7 +287,6 @@ default : // GuiActions.ALARM_PRIORITY_NONE background = Colors.alarmTopBarLowBg; foreground = Colors.alarmTopBarLowFg; - } return [background, foreground]; } @@ -311,7 +308,6 @@ 2000 // notifies user and hides the dialog ) break; - } } }