Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -re591b135f821c1b1e13c2db8429dc63648c2452c --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) @@ -64,16 +64,39 @@ } } + 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.CanBUSFaultCount ) { + _canbusFaultCountText.count = vData[0] + } + } + } + Column { id: _BloodFlowColumn width: 150 spacing: 20 topPadding: 100 leftPadding: 10 Text { id: _BloodFlow_Title - text: qsTr(" Blood ") + text: qsTr(" Blood ") width: _BloodFlowColumn.width - horizontalAlignment: Text.AlignHCenter + horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle font.underline: true @@ -99,15 +122,15 @@ } Column { id: _DialysateInletFlowColumn - width: 150 - spacing: 20 - topPadding: 100 - leftPadding: 180 + width : 150 + spacing : 20 + topPadding : 100 + leftPadding : 200 Text { id: _DialysateInletFlow_Title - text: qsTr(" Dialysate I ") + text: qsTr(" Dlyst I ") width: _DialysateInletFlowColumn.width - horizontalAlignment: Text.AlignLeft + horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle font.underline: true @@ -133,15 +156,15 @@ } Column { id: _DialysateOutletFlowColumn - width: 150 - spacing: 20 - topPadding: 100 - leftPadding: 400 + width : 150 + spacing : 20 + topPadding : 100 + leftPadding : 400 Text { id: _DialysateOutletFlow_Title - text: qsTr(" Dialysate O ") + text: qsTr(" Dlyst O ") width: _DialysateOutletFlowColumn.width - horizontalAlignment: Text.AlignLeft + horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle font.underline: true @@ -165,4 +188,67 @@ } } } + + Column { id: _PressureOcclusionColumn + width : 150 + spacing : 20 + topPadding : 100 + 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 { + text: modelData + width: _PressureOcclusionColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + Column { id: _LoadCellReadingColumn + width : 150 + spacing : 20 + topPadding : 100 + leftPadding : 800 + Text { + id: _LoadCellReading_Title + text: qsTr(" LoadCl ") + width: _LoadCellReadingColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vLoadCellReadings.reservoir1Prim .toFixed(2) , + vLoadCellReadings.reservoir1Bkup .toFixed(2) , + vLoadCellReadings.reservoir2Prim .toFixed(2) , + vLoadCellReadings.reservoir2Bkup .toFixed(2) + ] + Text { + text: modelData + width: _LoadCellReadingColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } }