Index: sources/gui/qml/main.qml =================================================================== diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r108450c58851ff7c48c4607494b8cdae59952908 --- sources/gui/qml/main.qml (.../main.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) +++ sources/gui/qml/main.qml (.../main.qml) (revision 108450c58851ff7c48c4607494b8cdae59952908) @@ -21,15 +21,25 @@ import Gui.View 0.1 import Gui.Actions 0.1 - // View classes import VHDAccelerometer 0.1 +import VHDSyringePump 0.1 +// POST +import VHDPOSTData 0.1 +import VDGPOSTData 0.1 + +// Device +import VDevice 0.1 + // Settings import VSettings 0.1 import VAdjustmentVersions 0.1 +import VAdjustmentService 0.1 import VDateTime 0.1 import VNetworkModel 0.1 +import VAdjustmentAlarmVolume 0.1 +import VBluetooth 0.1 // States views import VHDOperationMode 0.1 @@ -38,6 +48,8 @@ import VPostTreatmentStates 0.1 import VDisinfectStates 0.1 +// Treatment - Common +import VTreatmentVitals 0.1 // In-Treatment - Data import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 @@ -47,6 +59,7 @@ import VTreatmentRinseback 0.1 import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 +import VTreatmentStop 0.1 import VTreatmentRanges 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 @@ -110,10 +123,18 @@ width : Variables.applicationWidth height: Variables.applicationHeight + VHDPOSTData { id: vHDPOSTData } + VDGPOSTData { id: vDGPOSTData } + + VDevice { id: vDevice } VSettings { id: vSettings } VAdjustmentVersions { id: vAdjustmentVersions } + VAdjustmentService { id: vAdjustmentService } VDateTime { id: vDateTime } VNetworkModel { id: vNetwork } + VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } + VBluetooth { id: vBluetooth } + // ---- States VHDOperationMode { id: vHDOperationMode } VPreTreatmentStates { id: vPreTreatmentStates } @@ -122,14 +143,20 @@ VDisinfectStates { id: vDisinfectStates } VTreatmentBloodFlow { id: vTreatmentBloodFlow } + VTreatmentVitals { id: vTreatmentVitals + interval : vTreatmentCreate.bloodPressureMeasureInterval + } + VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } VTreatmentBloodPrime { id: vTreatmentBloodPrime } VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } + VTreatmentStop { id: vTreatmentStop } VHDAccelerometer { id: vHDAccelerometer } + VHDSyringePump { id: vHDSyringePump } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -198,6 +225,7 @@ // 3 - Footer MainMenu { id: _mainMenu + hidden: true // it should be hidden by default since the landing screen changed to init and it does not have the main menu untill the POST passes. titles: [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ] Component.onCompleted: { _settingsStack.visible = false @@ -229,6 +257,21 @@ font.pixelSize: 14 } + Text { // TEST : Ethernet IP + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 450 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + text : vNetwork.ethernetIP + font.pixelSize: 14 + } + Text { // TEST : Current Date/Time color : Colors.textMain anchors { @@ -244,16 +287,25 @@ font.pixelSize: 14 } - DiagnosticsDialog { id: _diagnosticsDialog } - SDItem { - onDoubleClicked:{ + SDItem { id: _sdItem + // TODO: disable this later. this is only for diagnostic purpose. + onDoubleClicked : { _diagnosticsDialog.open() } } - PowerItem { id: _powerItem } - AlarmItem { id: _alarmItem } - Keyboard { id: _keyboard } + // keyboard should always be before AlarmItem to not to covet it. + VirtualKeyboard { id: _keyboard } + + // AlarmItem should always be at the end so nothing covers it + AlarmItem { id: _alarmItem ; z: 997 } + + // PowerOff screen should still be avilable. Even if the Alarm happens the Power option should be available. + PowerItem { id: _powerItem ; z: 998 } + + // this dialog as an exception can cover the Alarm for debugging and testing. + DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + // NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. NotificationBar { id: _alarmBar