Index: sources/gui/qml/main.qml =================================================================== diff -u -rb38a0f4cf86482bb66ee69e1f809fb28b33edb4a -r6a1e770e3d7a8729ab7acdb7b2e96a5b72f8bc9f --- sources/gui/qml/main.qml (.../main.qml) (revision b38a0f4cf86482bb66ee69e1f809fb28b33edb4a) +++ sources/gui/qml/main.qml (.../main.qml) (revision 6a1e770e3d7a8729ab7acdb7b2e96a5b72f8bc9f) @@ -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 @@ -217,7 +226,7 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } - // ---- DG + // ---- DD VDGDrainPump { id: vDGDrainPump } VDDHeaters { id: vDDHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } @@ -234,6 +243,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 } @@ -326,6 +344,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 } @@ -353,10 +376,4 @@ timeout : _alarmItem.timeout z : 995 } - - GuiView { id: _GuiView - // Component.onCompleted: { - // console.debug("GuiView - complete") - // } - } }