Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -r296e0e140bfeb193a9f571873afa6934143b1075 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 296e0e140bfeb193a9f571873afa6934143b1075) @@ -79,62 +79,24 @@ font.pixelSize: Fonts.fontPixelTitle font.underline: true } - Text { - id: _BloodFlow_S32 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle + Repeater { + model: [ + vTreatmentFlows.bloodFlow_FlowSetPoint , + vTreatmentFlows.bloodFlow_MeasuredFlow .toFixed(2) , + vTreatmentFlows.bloodFlow_RotorSpeed .toFixed(2) , + vTreatmentFlows.bloodFlow_MotorSpeed .toFixed(2) , + vTreatmentFlows.bloodFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentFlows.bloodFlow_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentFlows.bloodFlow_PWMDutyCycle .toFixed(2) + ] + Text { + text: modelData + width: _BloodFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } } - Text { - id: _BloodFlow_F32_1 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _BloodFlow_F32_2 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _BloodFlow_F32_3 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _BloodFlow_F32_4 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _BloodFlow_F32_5 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _BloodFlow_F32_6 - text: qsTr("") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } } Column { id: _DialysateInletFlowColumn @@ -151,62 +113,25 @@ font.pixelSize: Fonts.fontPixelTitle font.underline: true } - Text { - id: _DialysateInletFlow_S32 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle + Repeater { + model: [ + vTreatmentFlows.dialysateFlow_FlowSetPoint , + vTreatmentFlows.dialysateFlow_MeasuredFlow .toFixed(2) , + vTreatmentFlows.dialysateFlow_RotorSpeed .toFixed(2) , + vTreatmentFlows.dialysateFlow_MotorSpeed .toFixed(2) , + vTreatmentFlows.dialysateFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentFlows.dialysateFlow_MotorCtlCurrent.toFixed(2) , + "%" + vTreatmentFlows.dialysateFlow_PWMDutyCycle .toFixed(2) + ] + Text { + id: _DialysateInletFlow_S32 + text: modelData + width: _DialysateInletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } } - Text { - id: _DialysateInletFlow_F32_1 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _DialysateInletFlow_F32_2 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _DialysateInletFlow_F32_3 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _DialysateInletFlow_F32_4 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _DialysateInletFlow_F32_5 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - id: _DialysateInletFlow_F32_6 - text: qsTr("") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } } Column { id: _DialysateOutletFlowColumn @@ -402,26 +327,6 @@ onDidActionReceive: { if ( ! visible ) return; switch(vAction) { - case GuiActions.BloodFlow: - _BloodFlow_S32 .text = vData[GuiActions.BloodFlow_FlowSetPoint ]; - _BloodFlow_F32_1.text = vData[GuiActions.BloodFlow_MeasuredFlow ].toFixed(2); - _BloodFlow_F32_2.text = vData[GuiActions.BloodFlow_RotorSpeed ].toFixed(2); - _BloodFlow_F32_3.text = vData[GuiActions.BloodFlow_MotorSpeed ].toFixed(2); - _BloodFlow_F32_4.text = vData[GuiActions.BloodFlow_MotorCtlSpeed ].toFixed(2); - _BloodFlow_F32_5.text = vData[GuiActions.BloodFlow_MotorCtlCurrent].toFixed(2); - _BloodFlow_F32_6.text = "%" + vData[GuiActions.BloodFlow_PWMDtCycle ].toFixed(2); - break; - - case GuiActions.DialysateInletFlow: - _DialysateInletFlow_S32 .text = vData[GuiActions.DialysateInletFlow_FlowSetPoint ]; - _DialysateInletFlow_F32_1.text = vData[GuiActions.DialysateInletFlow_MeasuredFlow ].toFixed(2); - _DialysateInletFlow_F32_2.text = vData[GuiActions.DialysateInletFlow_RotorSpeed ].toFixed(2); - _DialysateInletFlow_F32_3.text = vData[GuiActions.DialysateInletFlow_MotorSpeed ].toFixed(2); - _DialysateInletFlow_F32_4.text = vData[GuiActions.DialysateInletFlow_MotorCtlSpeed ].toFixed(2); - _DialysateInletFlow_F32_5.text = vData[GuiActions.DialysateInletFlow_MotorCtlCurrent ].toFixed(2); - _DialysateInletFlow_F32_6.text = "%" + vData[GuiActions.DialysateInletFlow_PWMDtCycle ].toFixed(2); - break; - case GuiActions.DialysateOutletFlow: _DialysateOutletFlow_F32_0.text = vData[GuiActions.DialysateOutletFlow_RefUFVol ].toFixed(2); _DialysateOutletFlow_F32_1.text = vData[GuiActions.DialysateOutletFlow_MeasUFVol ].toFixed(2);