Index: sources/gui/qml/main.qml =================================================================== diff -u -rf68b226e67eb500758ee94fe015df48931240013 -re1c454bcf26e1f4dd9aaffe05daeca138eb743b3 --- sources/gui/qml/main.qml (.../main.qml) (revision f68b226e67eb500758ee94fe015df48931240013) +++ sources/gui/qml/main.qml (.../main.qml) (revision e1c454bcf26e1f4dd9aaffe05daeca138eb743b3) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file main.qml * \author (last) Behrouz NematiPour - * \date (last) 28-Sep-2022 + * \date (last) 03-Apr-2023 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * @@ -44,6 +44,7 @@ import VNetworkModel 0.1 import VAdjustmentAlarmVolume 0.1 import VBluetooth 0.1 +import VDuetRoWaterDG 0.1 // States views import VHDOperationMode 0.1 @@ -110,6 +111,9 @@ // Disinfection import VDisinfectAdjustDisinfect 0.1 +// Confirm +import VConfirm 0.1 + // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -125,6 +129,8 @@ width : Variables.applicationWidth height: Variables.applicationHeight + VConfirm { id: vConfirm } + VHDPOSTData { id: vHDPOSTData } VDGPOSTData { id: vDGPOSTData } @@ -137,6 +143,7 @@ VNetworkModel { id: vNetwork } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } VBluetooth { id: vBluetooth } + VDuetRoWaterDG { id: vDuetRoWaterDG } // ---- States VHDOperationMode { id: vHDOperationMode } @@ -278,6 +285,21 @@ font.pixelSize: 14 } + Text { // TEST : Wireless IP + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 325 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + text : "W:" + vNetwork.wirelessIP + font.pixelSize: 15 + } + Text { // TEST : Ethernet IP color : Colors.textMain anchors { @@ -289,7 +311,7 @@ verticalAlignment : Text.AlignBottom height : 15 - text : vNetwork.ethernetIP + text : "E:" + vNetwork.ethernetIP font.pixelSize: 15 } @@ -312,6 +334,21 @@ font.pixelSize: 14 } + Text { // TEST : The treatment vital dialog countdown time + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 900 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left + font.pixelSize: 14 + } + Text { // TEST : Current Date/Time color : Colors.textMain anchors { @@ -345,7 +382,16 @@ SDCProgressItem { id: _sdcProgressItem // TODO: disable this later. this is only for diagnostic purpose. onDoubleClicked : { - _diagnosticsDialog.open() + if ( _GuiView.dryDemoMode ) { + let dryDemoTempID = 99 + let id = vConfirm.id + vConfirm.id = dryDemoTempID + vConfirm.doConfirm( true ) + vConfirm.id = id + } + else { + _diagnosticsDialog.open() + } } }