Index: sources/gui/qml/main.qml =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/qml/main.qml (.../main.qml) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/gui/qml/main.qml (.../main.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -22,107 +22,17 @@ import Gui.Actions 0.1 // View classes -import VGeneralEvent 0.1 -import VHDAccelerometer 0.1 -import VHDSyringePump 0.1 -import VHDBloodLeak 0.1 -import VHDAirBubble 0.1 import VTDAirTrap 0.1 -import VTDVoltage 0.1 import VTDBloodPump 0.1 import VTDValves 0.1 -import VTDBattery 0.1 import VTDSwitches 0.1 -import VTDEjector 0.1 -import VTDTemperature 0.1 -// POST -import VHDPOSTData 0.1 -import VDGPOSTData 0.1 +import VTDOPMode 0.1 // Device -import VDevice 0.1 +//import VDevice 0.1 // Settings -import VSettings 0.1 -import VLocalization 0.1 -import VAdjustmentVersions 0.1 -import VAdjustmentServiceMode 0.1 -import VAdjustmentServiceDates 0.1 -import VDateTime 0.1 -import VAdjustmentAlarmVolume 0.1 -import VBluetooth 0.1 -import VDuetRoWaterDG 0.1 -import VCloudSync 0.1 -import VHDUsageInfo 0.1 -import VAdjustmentInstitutionalRecord 0.1 -// States views -import VTDOpMode 0.1 //// ----- @LEAHIZED -import VPreTreatmentStates 0.1 -import VHDTreatmentStates 0.1 -import VPostTreatmentStates 0.1 -// Treatment - Common -import VTreatmentVitals 0.1 -// In-Treatment - Data -import VTreatmentBloodFlow 0.1 -import VTreatmentDialysateFlow 0.1 -import VTreatmentPressureOcclusion 0.1 -import VTreatmentUltrafiltration 0.1 -import VTreatmentTime 0.1 -import VTreatmentRinseback 0.1 -import VTreatmentRecirculate 0.1 -import VTreatmentBloodPrime 0.1 -import VTreatmentStop 0.1 -import VTreatmentRanges 0.1 -// Pre-Treatment -import VPreTreatmentAdjustmentInitTreatment 0.1 -import VDGFilterFlush 0.1 -import VPreTreatmentAdjustmentWaterSample 0.1 -import VPreTreatmentAdjustmentConsumablesConfirm 0.1 -import VPreTreatmentSelfTestNoCartridge 0.1 -import VPreTreatmentAdjustmentDisposablesConfirm 0.1 -import VPreTreatmentSelfTestDry 0.1 -import VPreTreatmentAdjustmentDisposablesPrime 0.1 -import VPreTreatmentDisposablesPrime 0.1 -import VPreTreatmentAdjustmentPatientConnectionBegin 0.1 -import VPreTreatmentAdjustmentUltrafiltrationInit 0.1 -import VPreTreatmentAdjustmentPatientConnectionConfirm 0.1 -import VPreTreatmentAdjustmentStartTreatment 0.1 -// --- -import VDGDrainPump 0.1 -import VDGHeaters 0.1 -import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 -import VDGPressures 0.1 -import VDGROPump 0.1 -import VDGReservoir 0.1 -import VDGTemperatures 0.1 -import VDGValvesStates 0.1 -import VTreatmentCreate 0.1 -import VDGAccelerometer 0.1 -import VDGConductivity 0.1 -// In-Treatment - Adjustemnt -import VTreatmentAdjustmentDuration 0.1 -import VTreatmentAdjustmentFlows 0.1 -import VTreatmentAdjustmentUltrafiltrationState 0.1 -import VTreatmentAdjustmentUltrafiltrationEdit 0.1 -import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 -import VTreatmentAdjustmentPressuresLimits 0.1 -import VTreatmentAdjustmentSaline 0.1 -import VTreatmentAdjustmentHeparin 0.1 -import VTreatmentAdjustmentRinseback 0.1 -import VTreatmentAdjustmentRecirculate 0.1 -import VTreatmentAdjustmentEnd 0.1 -// Post-Treatmnt -import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1 -import VPostTreatmentAdjustmentDisposablesRemovalConfirm 0.1 -import VPostTreatmentAdjustmentTreatmentLog 0.1 -// Disinfection -import VDisinfectAdjustDisinfect 0.1 -import VAdjustDGCleaningUsage 0.1 -// Confirm -import VConfirm 0.1 - // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -138,126 +48,6 @@ width : Variables.applicationWidth height: Variables.applicationHeight - VConfirm { id: vConfirm } - - VHDPOSTData { id: vHDPOSTData } - VDGPOSTData { id: vDGPOSTData } - - VDevice { id: vDevice } - VSettings { id: vSettings } - VLocalization { id: vLocalization } - VAdjustmentVersions { id: vAdjustmentVersions } - VAdjustmentServiceMode { id: vAdjustmentServiceMode } - VAdjustmentServiceDates { id: vAdjustmentServiceDates } - VDateTime { id: vDateTime } - VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } - VBluetooth { id: vBluetooth } - VDuetRoWaterDG { id: vDuetRoWaterDG } - VCloudSync { id: vCloudSync } - VHDUsageInfo { id: vHDUsageInfo } - VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } - //VAdjustIn - // ---- States - VTDOpMode { id: vTDOpMode - onStandbyChanged: { - if(vTDOpMode.standby) { - vTreatmentVitals.doReset() - } - } - } - VPreTreatmentStates { id: vPreTreatmentStates } - VHDTreatmentStates { id: vHDTreatmentStates } - VPostTreatmentStates { id: vPostTreatmentStates } - - VTreatmentBloodFlow { id: vTreatmentBloodFlow } - VTreatmentVitals { id: vTreatmentVitals - interval : vTreatmentCreate.bloodPressureMeasureInterval - enableDialog: vTDOpMode.inTreatment && vHDTreatmentStates.txTreatment - // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. - onEnableDialogChanged : { - if ( vTreatmentVitals.enableDialog ) { - vTreatmentVitals.doTimerStart() - } - else { - vTreatmentVitals.doTimerStop() - } - } - } - - VGeneralEvent { id: vGeneralEvent } - VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } - VHDAirBubble { id: vHDAirBubble } - VHDBloodLeak { id: vHDBloodLeak } - VTDAirTrap { id: vTDAirTrap } - VTDVoltage { id: vTDVoltage } - VTDBloodPump { id: vTDBloodPump } - VTDValves { id: vTDValves } - VTDBattery { id: vTDBattery } - VTDSwitches { id: vTDSwitches } - VTDEjector { id: vTDEjector } - VTDTemperature { id: vTDTemperature } - - VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } - VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } - VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } - VTreatmentTime { id: vTreatmentTime } - VTreatmentBloodPrime { id: vTreatmentBloodPrime } - VTreatmentRinseback { id: vTreatmentRinseback } - VTreatmentRecirculate { id: vTreatmentRecirculate } - VTreatmentStop { id: vTreatmentStop } - // ---- DG - VDGDrainPump { id: vDGDrainPump } - VDGHeaters { id: vDGHeaters } - VDGLoadCellReadings { id: vDGLoadCellReadings } - VDGOperationMode { id: vDGOperationMode } - VDGPressures { id: vDGPressures } - VDGROPump { id: vDGROPump } - VDGReservoir { id: vDGReservoir } - VDGTemperatures { id: vDGTemperatures } - VDGValvesStates { id: vDGValvesStates } - VDGAccelerometer { id: vDGAccelerometer } - VDGConductivity { id: vDGConductivity } - // --- Pre-Treatment Progress Data - VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } - VDGFilterFlush { id: vDGFilterFlush } - VPreTreatmentAdjustmentWaterSample { id: vPreTreatmentAdjustmentWaterSample } - VPreTreatmentAdjustmentConsumablesConfirm { id: vPreTreatmentAdjustmentConsumablesConfirm } - VPreTreatmentSelfTestNoCartridge { id: vPreTreatmentSelfTestNoCartridge } - VPreTreatmentAdjustmentDisposablesConfirm { id: vPreTreatmentAdjustmentDisposablesConfirm } - VPreTreatmentSelfTestDry { id: vPreTreatmentSelfTestDry } - VPreTreatmentAdjustmentDisposablesPrime { id: vPreTreatmentAdjustmentDisposablesPrime } - VPreTreatmentDisposablesPrime { id: vPreTreatmentDisposablesPrime } - VPreTreatmentAdjustmentPatientConnectionBegin { id: vPreTreatmentAdjustmentPatientConnectionBegin } - VPreTreatmentAdjustmentUltrafiltrationInit { id: vPreTreatmentAdjustmentUltrafiltrationInit } - VPreTreatmentAdjustmentPatientConnectionConfirm { id: vPreTreatmentAdjustmentPatientConnectionConfirm } - VPreTreatmentAdjustmentStartTreatment { id: vPreTreatmentAdjustmentStartTreatment } - - // --- - VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } - VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } - VTreatmentCreate { id: vTreatmentCreate } - - VTreatmentRanges { id: vTreatmentRanges } - VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } - VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } - VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } - VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } - VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } - VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } - VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } - VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } - VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } - - // --- Post Treatment - VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } - VPostTreatmentAdjustmentDisposablesRemovalConfirm { id: vPostTreatmentAdjustmentDisposablesRemovalConfirm } - VPostTreatmentAdjustmentTreatmentLog { id: vPostTreatmentAdjustmentTreatmentLog } - - // --- Disinfection - VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } - VAdjustDGCleaningUsage { id: vAdjustDGCleaningUsage } - Background {} // ----- Follow the below Z order ----- @@ -293,6 +83,10 @@ } } + VTDOPMode { id: vTDOpMode + } + + Connections { target: vTDOpMode function onStandbyWaitDisinfectChanged ( vValue ) { _mainMenu.isTreatment() } } @@ -450,7 +244,7 @@ // keyboard should always be before AlarmItem to not to covet it. KeyboardItem { id: _keyboard } - AlarmItem { id: _alarmItem ; z: 996 } + //AlarmItem { id: _alarmItem ; z: 996 } PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }