Index: sources/gui/qml/main.qml =================================================================== diff -u -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 -r3f555c49ddd2c983f469709e3c001d0e76159248 --- sources/gui/qml/main.qml (.../main.qml) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) +++ sources/gui/qml/main.qml (.../main.qml) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) @@ -23,7 +23,12 @@ // View classes import VHDAccelerometer 0.1 +import VHDSyringePump 0.1 +// POST +import VHDPOSTData 0.1 +import VDGPOSTData 0.1 + // Device import VDevice 0.1 @@ -116,6 +121,9 @@ width : Variables.applicationWidth height: Variables.applicationHeight + VHDPOSTData { id: vHDPOSTData } + VDGPOSTData { id: vDGPOSTData } + VDevice { id: vDevice } VSettings { id: vSettings } VAdjustmentVersions { id: vAdjustmentVersions } @@ -143,6 +151,7 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VHDAccelerometer { id: vHDAccelerometer } + VHDSyringePump { id: vHDSyringePump } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -211,6 +220,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 @@ -242,6 +252,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 {