Index: sources/gui/qml/main.qml =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363 --- sources/gui/qml/main.qml (.../main.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/qml/main.qml (.../main.qml) (revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363) @@ -69,6 +69,7 @@ // In-Treatment - Data import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 +import VTreatmentIsolatedUF 0.1 import VTreatmentPressureOcclusion 0.1 import VTreatmentUltrafiltration 0.1 import VTreatmentTime 0.1 @@ -122,6 +123,7 @@ import VFPTemperature 0.1 import VFPBoostPump 0.1 // In-Treatment - Adjustemnt +import VTreatmentAdjustmentBloodPrime 0.1 import VTreatmentAdjustmentBolusVolume 0.1 import VTreatmentAdjustmentDurationEdit 0.1 import VTreatmentAdjustmentDurationConfirm 0.1 @@ -130,6 +132,9 @@ import VTreatmentAdjustmentDialysateFlowRate 0.1 import VTreatmentAdjustmentDialysateTemperature 0.1 import VTreatmentAdjustmentFlows 0.1 +import VTreatmentAdjustmentIsolatedUFDurationEdit 0.1 +import VTreatmentAdjustmentIsolatedUFVolumeEdit 0.1 +import VTreatmentAdjustmentIsolatedUFConfirm 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 @@ -231,6 +236,7 @@ VTDTemperature { id: vTDTemperature } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } + VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } @@ -293,7 +299,11 @@ VTreatmentCreate { id: vTreatmentCreate } VTreatmentRanges { id: vTreatmentRanges } + VTreatmentAdjustmentBloodPrime { id: vTreatmentAdjustmentBloodPrime } VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume } + VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } + VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit } + VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } @@ -341,7 +351,7 @@ disable : _GuiView.manufactSetup || _GuiView.updateSetup hidden : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes. width : Variables.applicationWidth - isMainMenu : true + model : _model Component.onCompleted : { _settingsStack.visible = false @@ -355,12 +365,22 @@ _managerStack .visible = vIndex === 1 _settingsStack.visible = vIndex === 2 } + + ListModel { id: _model + ListElement { text: qsTr("Treatment") ; visible: true } + ListElement { text: qsTr("Prescriptions") ; visible: true } + ListElement { text: qsTr("Settings") ; visible: true } + } } Connections { target: vTDOpMode function onStandbyWaitDisinfectChanged ( vValue ) { _mainMenu.isTreatment() } } + Connections { target: _mainStack + function onIsCreateRx ( vState ) { _headerBar.isCreateRx = vState } + } + // 9 - Others HeaderBar { id: _headerBar anchors.top: parent.top @@ -378,7 +398,6 @@ AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } HeaderbarPrescription { id: _headerbarPrescription } HeaderbarWiFi { id: _headerbarWifi } - HeaderbarStorage { id: _headerbarStorage } HeaderbarSettings { id: _headerbarSettings } HeaderbarInformation { id: _headerbarInformation } TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals }