Index: sources/gui/qml/main.qml =================================================================== diff -u -rc62102200fea4a7acdee773156e6647a30d77967 -r2f76603ecaceffc19181bffbf811cae2966d7593 --- sources/gui/qml/main.qml (.../main.qml) (revision c62102200fea4a7acdee773156e6647a30d77967) +++ sources/gui/qml/main.qml (.../main.qml) (revision 2f76603ecaceffc19181bffbf811cae2966d7593) @@ -107,6 +107,15 @@ import VDDGenDialysate 0.1 import VDDLevel 0.1 import VDDBloodLeak 0.1 +// FP Data +import VFPValvesStates 0.1 +import VFPROPump 0.1 +import VFPPressures 0.1 +import VFPLevel 0.1 +import VFPFlow 0.1 +import VFPConductivity 0.1 +import VFPTemperature 0.1 +import VFPBoostPump 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 @@ -216,7 +225,7 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } - // ---- DG + // ---- DD VDGDrainPump { id: vDGDrainPump } VDDHeaters { id: vDDHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } @@ -233,6 +242,15 @@ VDDGenDialysate { id: vDDGenDialysate } VDDLevel { id: vDDLevel } VDDBloodLeak { id: vDDBloodLeak } + // --- FP Data + VFPValvesStates { id: vFPValvesStates } + VFPROPump { id: vFPROPump } + VFPPressures { id: vFPPressures } + VFPLevel { id: vFPLevel } + VFPFlow { id: vFPFlow } + VFPConductivity { id: vFPConductivity } + VFPTemperature { id: vFPTemperature } + VFPBoostPump { id: vFPBoostPump } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } @@ -325,6 +343,11 @@ anchors.top: parent.top } + GuiView { id: _GuiView + // Component.onCompleted: { + // console.debug("GuiView - complete") + // } + } // keyboard should always be before AlarmItem to not to covet it. KeyboardItem { id: _keyboard } @@ -352,10 +375,4 @@ timeout : _alarmItem.timeout z : 995 } - - GuiView { id: _GuiView - // Component.onCompleted: { - // console.debug("GuiView - complete") - // } - } }