Index: sources/gui/qml/main.qml =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/main.qml (.../main.qml) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ sources/gui/qml/main.qml (.../main.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -35,6 +35,8 @@ import VTDSwitches 0.1 import VTDEjector 0.1 import VTDTemperature 0.1 +import VListModel 0.1 + // POST import VHDPOSTData 0.1 import VDGPOSTData 0.1 @@ -140,6 +142,7 @@ 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 @@ -166,6 +169,7 @@ import "qrc:/dialogs" import "qrc:/dialogs/diagnostics" import "qrc:/dialogs/headerbar" +import "qrc:/dialogs/watersample" /*! * \brief Initialization and start point of the QML @@ -235,6 +239,7 @@ VTDSwitches { id: vTDSwitches } VTDEjector { id: vTDEjector } VTDTemperature { id: vTDTemperature } + VListModel { id: vListModel } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } @@ -313,6 +318,7 @@ VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } + VTreatmentAdjustmentPressuresWidening { id: vTreatmentAdjustmentPressuresWidening } VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } @@ -415,19 +421,21 @@ KeyboardItem { id: _keyboard } // Dialogs - AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } - HeaderbarPrescription { id: _headerbarPrescription } - HeaderbarWiFi { id: _headerbarWifi } - HeaderbarSettings { id: _headerbarSettings } - HeaderbarInformation { id: _headerbarInformation } - TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } - EndTreatmentDialog { id: _endTreatmentDialog } + 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 } - LockDialog { id: _lockDialog } - AlarmItem { id: _alarmItem ; z: 996 } - PowerItem { id: _powerItem ; z: 997 } - ConfirmDialog { id: _confirmDialog ; z: 998 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + LockDialog { id: _lockDialog } + AlarmItem { id: _alarmItem ; z: 996 } + PowerItem { id: _powerItem ; z: 997 } + ConfirmDialog { id: _confirmDialog ; z: 998 } + 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.