Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r296e0e140bfeb193a9f571873afa6934143b1075 -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 296e0e140bfeb193a9f571873afa6934143b1075) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3) @@ -115,7 +115,7 @@ } Repeater { model: [ - vTreatmentFlows.dialysateFlow_FlowSetPoint , + vTreatmentFlows.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentFlows.dialysateFlow_MeasuredFlow .toFixed(2) , vTreatmentFlows.dialysateFlow_RotorSpeed .toFixed(2) , vTreatmentFlows.dialysateFlow_MotorSpeed .toFixed(2) , @@ -124,7 +124,6 @@ "%" + vTreatmentFlows.dialysateFlow_PWMDutyCycle .toFixed(2) ] Text { - id: _DialysateInletFlow_S32 text: modelData width: _DialysateInletFlowColumn.width horizontalAlignment: Text.AlignRight @@ -148,62 +147,24 @@ 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 + Repeater { + model: [ + vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , + "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) + ] + Text { + text: modelData + 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 @@ -220,139 +181,30 @@ font.pixelSize: Fonts.fontPixelTitle font.underline: true } - Text { - id: _AlarmStatus_Priority - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { - id: _AlarmStatus_ID - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { - id: _AlarmStatus_EsclateIn - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_MuteTimeout - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_systemFault - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_stop - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_noClear - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_noResume - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_noRinseback - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_noEndTreatment - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_noNewTreatment - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_bypassDialyzer - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_alarmsToEscalate - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - Text { id: _AlarmStatus_alarmsSilenced - text: qsTr("") - width: _AlarmStatusColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton - } - } - Connections { - target: _GuiView - onDidActionReceive: { - if ( ! visible ) return; - switch(vAction) { - 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 ]) - _AlarmStatus_EsclateIn .text = "Escalates In : " + vData[GuiActions.AlarmStatus_EscalateIn ] - _AlarmStatus_MuteTimeout .text = "MuteTimeout : " + vData[GuiActions.AlarmStatus_MuteTimeout ] - _AlarmStatus_systemFault .text = (vData[GuiActions.AlarmStatus_Flag_systemFault ] ? "1" : "0" ) + " : systemFault " - _AlarmStatus_stop .text = (vData[GuiActions.AlarmStatus_Flag_stop ] ? "1" : "0" ) + " : stop " - _AlarmStatus_noClear .text = (vData[GuiActions.AlarmStatus_Flag_noClear ] ? "1" : "0" ) + " : noClear " - _AlarmStatus_noResume .text = (vData[GuiActions.AlarmStatus_Flag_noResume ] ? "1" : "0" ) + " : noResume " - _AlarmStatus_noRinseback .text = (vData[GuiActions.AlarmStatus_Flag_noRinseback ] ? "1" : "0" ) + " : noRinseback " - _AlarmStatus_noEndTreatment .text = (vData[GuiActions.AlarmStatus_Flag_noEndTreatment ] ? "1" : "0" ) + " : noEndTreatment " - _AlarmStatus_noNewTreatment .text = (vData[GuiActions.AlarmStatus_Flag_noNewTreatment ] ? "1" : "0" ) + " : noNewTreatment " - _AlarmStatus_bypassDialyzer .text = (vData[GuiActions.AlarmStatus_Flag_bypassDialyzer ] ? "1" : "0" ) + " : bypassDialyzer " - _AlarmStatus_alarmsToEscalate.text = (vData[GuiActions.AlarmStatus_Flag_alarmsToEscalate] ? "1" : "0" ) + " : alarmsToEscalate " - _AlarmStatus_alarmsSilenced .text = (vData[GuiActions.AlarmStatus_Flag_alarmsSilenced ] ? "1" : "0" ) + " : alarmsSilenced " - break; + Repeater { + model: [ + _GuiView.alarmPriorityName(vAlarmStatus.alarm_Priority) , + _GuiView.alarmIDName (vAlarmStatus.alarm_AlarmID) , + "Escalates In : " + vAlarmStatus.alarm_EscalateIn , + "MuteTimeout : " + vAlarmStatus.alarm_MuteTimeout , + (vAlarmStatus.alarm_Flag_systemFault ? "1" : "0" ) + " : systemFault " , + (vAlarmStatus.alarm_Flag_stop ? "1" : "0" ) + " : stop " , + (vAlarmStatus.alarm_Flag_noClear ? "1" : "0" ) + " : noClear " , + (vAlarmStatus.alarm_Flag_noResume ? "1" : "0" ) + " : noResume " , + (vAlarmStatus.alarm_Flag_noRinseback ? "1" : "0" ) + " : noRinseback " , + (vAlarmStatus.alarm_Flag_noEndTreatment ? "1" : "0" ) + " : noEndTreatment " , + (vAlarmStatus.alarm_Flag_noNewTreatment ? "1" : "0" ) + " : noNewTreatment " , + (vAlarmStatus.alarm_Flag_bypassDialyzer ? "1" : "0" ) + " : bypassDialyzer " , + (vAlarmStatus.alarm_Flag_alarmsToEscalate ? "1" : "0" ) + " : alarmsToEscalate " , + (vAlarmStatus.alarm_Flag_alarmsSilenced ? "1" : "0" ) + " : alarmsSilenced " + ] + Text { + id: _AlarmStatus_Priority + text: modelData + width: _AlarmStatusColumn.width + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelButton } } }