Index: sources/gui/qml/main.qml =================================================================== diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2 --- sources/gui/qml/main.qml (.../main.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) +++ sources/gui/qml/main.qml (.../main.qml) (revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2) @@ -24,6 +24,7 @@ // View classes import VHDAccelerometer 0.1 +import VUIPostSingleResult 0.1 // Settings import VSettings 0.1 @@ -48,6 +49,8 @@ import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 import VTreatmentRanges 0.1 +import VHDPostSingleResult 0.1 +import VHDPostFinalResult 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 import VDGFilterFlush 0.1 @@ -74,6 +77,8 @@ import VDGValvesStates 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 +import VDGPostSingleResult 0.1 +import VDGPostFinalResult 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -100,6 +105,7 @@ import "qrc:/pages" import "qrc:/pages/treatment" import "qrc:/pages/settings" +import "qrc:/pages/post" import "qrc:/components" import "qrc:/dialogs" @@ -114,6 +120,7 @@ VAdjustmentVersions { id: vAdjustmentVersions } VDateTime { id: vDateTime } VNetworkModel { id: vNetwork } + VUIPostSingleResult { id: vUIPostSingleResult } // ---- States VHDOperationMode { id: vHDOperationMode } VPreTreatmentStates { id: vPreTreatmentStates } @@ -130,6 +137,8 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VHDAccelerometer { id: vHDAccelerometer } + VHDPostSingleResult { id: vHDPostSingleResult } + VHDPostFinalResult { id: vHDPostFinalResult } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -141,6 +150,8 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } + VDGPostSingleResult { id: vDGPostSingleResult } + VDGPostFinalResult { id: vDGPostFinalResult } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } @@ -214,6 +225,8 @@ // 9 - Others + PostInProgress { id: _postInProgress } + Text { // TEST : Application version should be moved into the information screen later. color : Colors.textMain anchors { @@ -265,4 +278,10 @@ timeout : _alarmItem.timeout backgroundFading : vHDOperationMode.fault } + + Component.onCompleted: { + // TODO: Re-show the main menu when re-entering the start screen + _mainMenu.visible = false + _mainStack.push(_postInProgress) + } }