Index: sources/gui/qml/main.qml =================================================================== diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f --- sources/gui/qml/main.qml (.../main.qml) (revision 0a4abcc41defc031ae20dd79f9550619bc6c9806) +++ sources/gui/qml/main.qml (.../main.qml) (revision 96854524927f212c24b9e4a253baeff2e672228f) @@ -36,7 +36,12 @@ import VTreatmentBloodPrime 0.1 import VTreatmentRanges 0.1 import VHDAccelerometer 0.1 - +// Pre-Treatment Progress Data +import VDGFilterFlush 0.1 +import VPreTreatmentSelfTestNoCartridge 0.1 +import VPreTreatmentSelfTestDry 0.1 +import VPreTreatmentPrime 0.1 +// --- import VDGDrainPump 0.1 import VDGHeaters 0.1 import VDGLoadCellReadings 0.1 @@ -46,7 +51,6 @@ import VDGReservoir 0.1 import VDGTemperatures 0.1 import VDGValvesStates 0.1 -import VPriming 0.1 import VTreatmentBegin 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 @@ -103,11 +107,15 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } + // --- Pre-Treatment Progress Data + VDGFilterFlush { id: vDGFilterFlush } + VPreTreatmentSelfTestNoCartridge { id: vPreTreatmentSelfTestNoCartridge } + VPreTreatmentSelfTestDry { id: vPreTreatmentSelfTestDry } + VPreTreatmentPrime { id: vPreTreatmentPrime } // --- VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } - VPriming { id: vPriming } VTreatmentBegin { id: vTreatmentBegin } VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit }