Index: sources/gui/qml/main.qml =================================================================== diff -u -r72289d4b682e419df5d6f7210eca83d97cd657ae -r3946bf96b758f8b62c3269c03cb4dca41594aedf --- sources/gui/qml/main.qml (.../main.qml) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) +++ sources/gui/qml/main.qml (.../main.qml) (revision 3946bf96b758f8b62c3269c03cb4dca41594aedf) @@ -35,6 +35,9 @@ import VTDSwitches 0.1 import VTDEjector 0.1 import VTDTemperature 0.1 +import VHeaderbarModel 0.1 +import VWaterSampleModel 0.1 + // POST import VHDPOSTData 0.1 import VDGPOSTData 0.1 @@ -51,31 +54,39 @@ import VDateTime 0.1 import VAdjustmentAlarmVolume 0.1 import VBluetooth 0.1 -import VDuetRoWaterDG 0.1 +import VAdjustRoWaterMode 0.1 +import VRoWaterMode 0.1 import VCloudSync 0.1 import VHDUsageInfo 0.1 +import VInstitutionalRecord 0.1 import VAdjustmentInstitutionalRecord 0.1 +import VAdvancedInstitutionalRecord 0.1 +import VAdjustmentAdvancedInstitutionalRecord 0.1 // States views import VTDOpMode 0.1 //// ----- @LEAHIZED import VPreTreatmentStates 0.1 import VTDTreatmentStates 0.1 import VPostTreatmentStates 0.1 +import VWaterSample 0.1 // Treatment - Common import VTreatmentVitals 0.1 // 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 import VTreatmentParametersSetPoint 0.1 import VTreatmentRinseback 0.1 import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 +import VTreatmentSaline 0.1 import VTreatmentStop 0.1 import VTreatmentRanges 0.1 import VTreatmentHeparin 0.1 +import VTreatmentTrends 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 @@ -95,7 +106,7 @@ import VDGDrainPump 0.1 import VDDHeaters 0.1 import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 +import VDDOperationMode 0.1 import VDDPressures 0.1 import VDGROPump 0.1 import VDGReservoir 0.1 @@ -117,13 +128,27 @@ import VFPConductivity 0.1 import VFPTemperature 0.1 import VFPBoostPump 0.1 +import VFPRORejectionPercentage 0.1 // In-Treatment - Adjustemnt -import VTreatmentAdjustmentDuration 0.1 +import VTreatmentAdjustmentBloodPrime 0.1 +import VTreatmentAdjustmentBolusVolume 0.1 +import VTreatmentAdjustmentDurationEdit 0.1 +import VTreatmentAdjustmentDurationConfirm 0.1 +import VTreatmentAdjustmentSetPoints 0.1 +import VTreatmentAdjustmentVitalsAlarmLimits 0.1 +import VTreatmentAdjustmentBloodFlowRate 0.1 +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 VTreatmentAdjustmentIsolatedUFState 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 +import VTreatmentAdjustmentPressuresWidening 0.1 import VTreatmentAdjustmentSaline 0.1 import VTreatmentAdjustmentVitals 0.1 import VTreatmentAdjustmentHeparin 0.1 @@ -150,6 +175,7 @@ import "qrc:/dialogs" import "qrc:/dialogs/diagnostics" import "qrc:/dialogs/headerbar" +import "qrc:/dialogs/watersample" /*! * \brief Initialization and start point of the QML @@ -172,10 +198,14 @@ VDateTime { id: vDateTime } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } VBluetooth { id: vBluetooth } - VDuetRoWaterDG { id: vDuetRoWaterDG } + VAdjustRoWaterMode { id: vAdjustRoWaterMode } + VRoWaterMode { id: vRoWaterMode } VCloudSync { id: vCloudSync } VHDUsageInfo { id: vHDUsageInfo } VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } + VInstitutionalRecord { id: vInstitutionalRecord } + VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord } + VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord } //VAdjustIn // ---- States VTDOpMode { id: vTDOpMode @@ -184,7 +214,6 @@ vTreatmentVitals.doReset() vTreatmentCreate.txCode = "" vTreatmentCreate.parametersValidated = false - vTreatmentCreate.parametersConfirmed = false } } } @@ -196,7 +225,7 @@ VTreatmentVitals { id: vTreatmentVitals interval : vTreatmentCreate.bloodPressureMeasureInterval canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment - enableBPCuff : true // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff + enableBPCuff : vSettings.integratedBPCuff onCanStartIntervalChanged : { if ( vTreatmentVitals.canStartInterval ) { vTreatmentVitals.doTimerStart() } else { vTreatmentVitals.doTimerStop() } @@ -216,13 +245,18 @@ VTDSwitches { id: vTDSwitches } VTDEjector { id: vTDEjector } VTDTemperature { id: vTDTemperature } + VHeaderbarModel { id: vHeaderbarModel } + VWaterSampleModel { id: vWaterSampleModel } + VWaterSample { id: vWaterSample } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } + VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } VTreatmentParametersSetPoint { id: vTreatmentParametersSetPoint } VTreatmentBloodPrime { id: vTreatmentBloodPrime } + VTreatmentSaline { id: vTreatmentSaline } VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } @@ -232,7 +266,7 @@ VDGDrainPump { id: vDGDrainPump } VDDHeaters { id: vDDHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } - VDGOperationMode { id: vDGOperationMode } + VDDOperationMode { id: vDDOperationMode } VDDPressures { id: vDDPressures } VDGROPump { id: vDGROPump } VDGReservoir { id: vDGReservoir } @@ -253,6 +287,7 @@ VFPConductivity { id: vFPConductivity } VFPTemperature { id: vFPTemperature } VFPBoostPump { id: vFPBoostPump } + VFPRORejectionPercentage { id: vFPRORejectionPercentage } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } @@ -269,17 +304,32 @@ VPreTreatmentAdjustmentStartTreatment { id: vPreTreatmentAdjustmentStartTreatment } // --- - VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } + VTreatmentAdjustmentDurationEdit { id: vTreatmentAdjustmentDurationEdit } + VTreatmentAdjustmentDurationConfirm { id: vTreatmentAdjustmentDurationConfirm } + VTreatmentAdjustmentSetPoints { id: vTreatmentAdjustmentSetPoints } + VTreatmentAdjustmentVitalsAlarmLimits { id: vTreatmentAdjustmentVitalsAlarmLimits } + VTreatmentAdjustmentBloodFlowRate { id: vTreatmentAdjustmentBloodFlowRate } + VTreatmentAdjustmentDialysateFlowRate { id: vTreatmentAdjustmentDialysateFlowRate } + VTreatmentAdjustmentDialysateTemperature { id: vTreatmentAdjustmentDialysateTemperature } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } VTreatmentRanges { id: vTreatmentRanges } + VTreatmentTrends { id: vTreatmentTrends } + + VTreatmentAdjustmentBloodPrime { id: vTreatmentAdjustmentBloodPrime } + VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume } + VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } + VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit } + VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm } + VTreatmentAdjustmentIsolatedUFState { id: vTreatmentAdjustmentIsolatedUFState } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } + VTreatmentAdjustmentPressuresWidening { id: vTreatmentAdjustmentPressuresWidening } VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } @@ -294,6 +344,21 @@ VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } VAdjustDGCleaningUsage { id: vAdjustDGCleaningUsage } + QtObject { id: _colorMode + readonly property color modeBackgroundColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite + readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeSelctedColor : vSettings.darkMode ? Colors.darkModeSelect : Colors.lightModeSelect + readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.darkModeAutoStep : Colors.lightModeAutoStep + readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused + readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu + readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu + readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.lightModeSelect + readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.lightModeSelect + readonly property color modeAlarmListColor : vSettings.darkMode ? Colors.offWhite : Colors.alarmDialogText + readonly property color modeAlarmStopStateColor : vSettings.darkMode ? Colors.darkModeAlarmStopState : Colors.lightModeAlarmStopState + } + Background {} // ----- Follow the below Z order ----- @@ -321,7 +386,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 @@ -335,6 +400,12 @@ _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 @@ -352,22 +423,27 @@ // } } // keyboard should always be before AlarmItem to not to covet it. - KeyboardItem { id: _keyboard } + KeyboardItem { id: _keyboard } // Dialogs - AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } - HeaderbarPrescription { id: _headerbarPrescription } - HeaderbarWiFi { id: _headerbarWifi } - HeaderbarStorage { id: _headerbarStorage } - HeaderbarSettings { id: _headerbarSettings } - HeaderbarInformation { id: _headerbarInformation } - TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } - LockDialog { id: _lockDialog } - AlarmItem { id: _alarmItem ; z: 996 } - PowerItem { id: _powerItem ; z: 997 } - ConfirmDialog { id: _confirmDialog ; z: 998 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } + HeaderbarPrescription { id: _headerbarPrescription } + HeaderbarWiFi { id: _headerbarWifi } + HeaderbarSettings { id: _headerbarSettings } + HeaderbarInformation { id: _headerbarInformation } + WaterSampleDialog { id: _headerbarWaterSampleDialysate } + TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } + EndTreatmentDialog { id: _endTreatmentDialog } + RinsebackCompleteDialog { id: _rinsebackCompleteDialog } + AutoHideInfo { id: _autoHideInfo } + LockDialog { id: _lockDialog } + AlarmItem { id: _alarmItem ; z: 996 } + PowerItem { id: _powerItem ; z: 997 } + ConfirmDialog { id: _confirmDialog ; z: 998 } + DryDemoDialog { id: _dryDemoDialog ; z: 999 } + DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. NotificationBar { id: _alarmBar