Index: sources/gui/qml/main.qml =================================================================== diff -u -r2c35a3fa17eef76c7a47578974b928c03f67c83d -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 --- sources/gui/qml/main.qml (.../main.qml) (revision 2c35a3fa17eef76c7a47578974b928c03f67c83d) +++ sources/gui/qml/main.qml (.../main.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) @@ -7,7 +7,7 @@ * * \file main.qml * \author (last) Peter Lucia - * \date (last) 26-Jun-2020 + * \date (last) 15-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * @@ -34,9 +34,6 @@ import VTreatmentAdjustmentDuration 0.1; import VTreatmentAdjustmentFlows 0.1; -import VTreatmentAdjustmentUltrafiltrationState 0.1; -import VTreatmentAdjustmentUltrafiltrationEdit 0.1; -import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; import VCreateTreatment 0.1; import VDGDrainPump 0.1; @@ -76,7 +73,6 @@ ) break; } - } } @@ -88,7 +84,6 @@ _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, vAlarmStatus.alarm_MuteTimeout); - if (isAlarmHighPriority()) { _alarm_dialog.visible = true; _alarm_bar.visible = false; @@ -104,6 +99,7 @@ _alarm_dialog.visible = false; } } + VPowerOff { id: vPowerOff } VHDOperationMode { id: vHDOperationMode } VTreatmentBloodFlow { id: vTreatmentBloodFlow } @@ -124,9 +120,6 @@ VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } - VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } - VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } - VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VCreateTreatment { id: vCreateTreatment } // ----- Follow the below Z order ----- @@ -217,7 +210,7 @@ color: Colors.textMain anchors { right: parent.right - margins: 10 + margins: 5 bottom: parent.bottom } horizontalAlignment: Text.AlignRight @@ -228,6 +221,24 @@ font.pixelSize: 14 } + Rectangle { // TEST : SD-Card not present should be handled with better indication(s). + color : ! _GuiView.sdIsReady ? "red" : _GuiView.sdIsReadOnly ? "gray" : "green" + anchors { + right : parent.right + bottom : parent.bottom + bottomMargin: 35 + rightMargin: 10 + } + width : 25 + height: 25 + radius: width + Image { id: _imageMicrosd + anchors.fill: parent + source: "qrc:/images/iMicroSD" + } + visible: true // ! _GuiView.sdIsReady || _GuiView.sdIsReadOnly + } + function getRootTextFromAlarmLevel(level) { let root_color = ""; let text_color = "";