Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r4d201ed69decd17c5fe8ed150fd90f194b35a486 -r732bc047743c99a157cf147f5313194867c1f5e3 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 4d201ed69decd17c5fe8ed150fd90f194b35a486) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 732bc047743c99a157cf147f5313194867c1f5e3) @@ -137,83 +137,155 @@ } } - Column { id: _DialysateFlowColumn + Column { id: _DialysateInletFlowColumn width: 150 spacing: 20 topPadding: 100 leftPadding: 180 Text { - id: _DialysateFlow_Title - text: qsTr(" Dialysate ") - width: _DialysateFlowColumn.width + id: _DialysateInletFlow_Title + text: qsTr(" Dialysate I ") + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignLeft color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle font.underline: true } Text { - id: _DialysateFlow_S32 + id: _DialysateInletFlow_S32 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } Text { - id: _DialysateFlow_F32_1 + id: _DialysateInletFlow_F32_1 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } Text { - id: _DialysateFlow_F32_2 + id: _DialysateInletFlow_F32_2 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } Text { - id: _DialysateFlow_F32_3 + id: _DialysateInletFlow_F32_3 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } Text { - id: _DialysateFlow_F32_4 + id: _DialysateInletFlow_F32_4 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } Text { - id: _DialysateFlow_F32_5 + id: _DialysateInletFlow_F32_5 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } Text { - id: _DialysateFlow_F32_6 + id: _DialysateInletFlow_F32_6 text: qsTr("") - width: _DialysateFlowColumn.width + width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } } + Column { id: _DialysateOutletFlowColumn + width: 150 + spacing: 20 + topPadding: 100 + leftPadding: 400 + Text { + id: _DialysateOutletFlow_Title + text: qsTr(" Dialysate O ") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Text { + id: _DialysateOutletFlow_F32_0 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Text { + id: _DialysateOutletFlow_F32_1 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Text { + id: _DialysateOutletFlow_F32_2 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Text { + id: _DialysateOutletFlow_F32_3 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Text { + id: _DialysateOutletFlow_F32_4 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Text { + id: _DialysateOutletFlow_F32_5 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Text { + id: _DialysateOutletFlow_F32_6 + text: qsTr("") + width: _DialysateOutletFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + Column { id: _AlarmStatusColumn width: 270 spacing: 5 topPadding: 100 - leftPadding: 400 + leftPadding: 700 Text { id: _AlarmStatus_Title text: qsTr(" Alarm Status ") @@ -331,23 +403,35 @@ 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) + "%"; + _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.DialysateFlow: - _DialysateFlow_S32 .text = vData[GuiActions.DialysateFlow_FlowSetPoint ]; - _DialysateFlow_F32_1.text = vData[GuiActions.DialysateFlow_MeasuredFlow ].toFixed(2); - _DialysateFlow_F32_2.text = vData[GuiActions.DialysateFlow_RotorSpeed ].toFixed(2); - _DialysateFlow_F32_3.text = vData[GuiActions.DialysateFlow_MotorSpeed ].toFixed(2); - _DialysateFlow_F32_4.text = vData[GuiActions.DialysateFlow_MotorCtlSpeed ].toFixed(2); - _DialysateFlow_F32_5.text = vData[GuiActions.DialysateFlow_MotorCtlCurrent].toFixed(2); - _DialysateFlow_F32_6.text = vData[GuiActions.DialysateFlow_PWMDtCycle ].toFixed(2) + "%"; + + 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); + _DialysateOutletFlow_F32_2.text = vData[GuiActions.DialysateOutletFlow_RotorSpeed ].toFixed(2); + _DialysateOutletFlow_F32_3.text = vData[GuiActions.DialysateOutletFlow_MotorSpeed ].toFixed(2); + _DialysateOutletFlow_F32_4.text = vData[GuiActions.DialysateOutletFlow_MotorCtlSpeed ].toFixed(2); + _DialysateOutletFlow_F32_5.text = vData[GuiActions.DialysateOutletFlow_MotorCtlCurrent ].toFixed(2); + _DialysateOutletFlow_F32_6.text = "%" + vData[GuiActions.DialysateOutletFlow_PWMDtCycle ].toFixed(2); + break; + case GuiActions.AlarmStatus: _AlarmStatus_Priority .text = _GuiView.alarmPriorityName(vData[GuiActions.AlarmStatus_Priority ]) _AlarmStatus_ID .text = _GuiView.alarmIDName (vData[GuiActions.AlarmStatus_AlarmID ])