Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -rbf645acccabb7b5a84801620c4f7fa0b0e6878e0 -r06d10ee1174f0947a01087554f3da3109b47aef6 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision bf645acccabb7b5a84801620c4f7fa0b0e6878e0) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 06d10ee1174f0947a01087554f3da3109b47aef6) @@ -78,190 +78,6 @@ _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) } } - - Text { id : _canbusFaultCountText - property int count: 0 - visible: true - anchors { - top : parent.top - left : parent.left - topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 - leftMargin : (Variables.headerHeight - Variables.logoHeight) / 2 - } - text: qsTr("CAN Faults : %1").arg(count) - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - - Connections { target: _GuiView - onDidActionReceive: { - if (vAction === GuiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } - - Column { id: _BloodFlowColumn - width : 150 - spacing : 20 - topPadding : 75 - leftPadding : 10 - Text { - id: _BloodFlow_Title - text: qsTr(" Blood ") - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - font.underline: true - } - Repeater { - model: [ - vTreatmentBloodFlow.bloodFlow_FlowSetPoint , - vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , - "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) - ] - Text { - text: modelData - width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } - - Column { id: _DialysateInletFlowColumn - width : 150 - spacing : 20 - topPadding : 75 - leftPadding : 200 - Text { - id: _DialysateInletFlow_Title - text: qsTr(" Dlyst I ") - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - font.underline: true - } - Repeater { - model: [ - vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) - ] - Text { - text: modelData - width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } - - Column { id: _DialysateOutletFlowColumn - width : 150 - spacing : 20 - topPadding : 75 - leftPadding : 400 - Text { - id: _DialysateOutletFlow_Title - text: qsTr(" Dlyst O ") - width: _DialysateOutletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - font.underline: true - } - 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 { - objectName: "_OutletFlowData" + index - text: modelData - width: _DialysateOutletFlowColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } - - Column { id: _PressureOcclusionColumn - width : 150 - spacing : 20 - topPadding : 75 - leftPadding : 600 - Text { - id: _PressureOcclusion_Title - text: qsTr(" Prsr Oc ") - width: _PressureOcclusionColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - font.underline: true - } - Repeater { - model: [ - vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_VenousPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_BloodPumpOcclusion .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_DialysateInletPumpOcclusion .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_DialysateOutletPumpOcclusion .toFixed(2) - ] - Text { - objectName: "_PressureOcclusionData" + index - text: modelData - width: _PressureOcclusionColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } - - Column { id: _HDOperationModeColumn - width : 300 - spacing : -5 - topPadding : 625 - leftPadding : 10 - Row { - Text { - id: _HDOperationMode_Title - text: qsTr("Op Mode : ") - //width: _HDOperationModeColumn.width - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { - objectName: "_HDOperationModeData" - text: vHDOperationMode.text - //width: _HDOperationModeColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } } /*