Index: sources/gui/qml/main.qml =================================================================== diff -u -r057d3ef4e29c63235040c5cfe8c6421ef7787d6a -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/gui/qml/main.qml (.../main.qml) (revision 057d3ef4e29c63235040c5cfe8c6421ef7787d6a) +++ sources/gui/qml/main.qml (.../main.qml) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -12,9 +12,47 @@ * */ +/* +-Item + Circle + LogoD + MainMenu + PlaceHolderText + ProgressCircle + ScreenItem + StackItem + TextRect + TimeText + TouchArea + RangeMarker + +-Text + TitleText + +-Rectangle + Line + Background + CloseButton + TouchRect + BackButton + ConfirmButton + ExportButton + USBButton + RangeRect + ProgressBar + ProgressBarEx + ProgressRect + Slider + RangeBar + +-Dialog + ModalDialog + AutoHideInfo + PowwerOff +*/ + // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 // Project // C++ imports @@ -26,7 +64,6 @@ import VTreatmentBloodFlow 0.1; import VTreatmentDialysateFlow 0.1; import VTreatmentUltrafiltration 0.1; -import VTreatmentTime 0.1; import VAlarmStatus 0.1; import VPowerOff 0.1; @@ -53,7 +90,7 @@ case GuiActions.PowerOffBroadcast: _autoHideInfo.showDialog( qsTr("System is shutting down"), - 5000 // if there is any error happening then after 5 seconds dialog hides. + 5000 // if any error happens and shutdown is not successful then after 5 seconds dialog hides. ) break; @@ -62,15 +99,13 @@ } // TODO : When Testing data on Setting screen is removed - // This needs to be moved into the TreatmentFlows.qml + // This needs to be moved into the Treatment______.qml VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } - VTreatmentTime { id: vTreatmentTime } VAlarmStatus { id: vAlarmStatus } VPowerOff { id: vPowerOff onPoweroff_statusChanged: { - console.debug("vpoweroff_status", vpoweroff_status) switch (vpoweroff_status) { case GuiActions.Command: _powerOffDialog.open() @@ -83,7 +118,7 @@ case GuiActions.Rejected: _autoHideInfo.showDialog( qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg() - 1000 // if there is any error happening then after 5 seconds dialog hides. + 2000 // notifies user and hides the dialog ) break; @@ -125,6 +160,13 @@ } } + + NotificationBar { id: _alarm + anchors.bottom: _mainMenu.top + level : vAlarmStatus.alarm_Priority + text : vAlarmStatus.text() + } + // 9 - Others Text { // TEST : Application version should be moved into the information screen later. color: Colors.textMain