Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) @@ -28,6 +28,20 @@ */ ScreenItem { id: _root + Text { id : _titleText + visible: true + anchors { + top : parent.top + left : parent.horizontalCenter + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + horizontalCenter: parent.horizontalCenter + } + text: qsTr("~ HD ~") + horizontalAlignment: Text.horizontalCenter + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + USBButton { id: _usbButton anchors { top : parent.top @@ -88,9 +102,9 @@ } Column { id: _BloodFlowColumn - width: 150 - spacing: 20 - topPadding: 100 + width : 150 + spacing : 20 + topPadding : 75 leftPadding: 10 Text { id: _BloodFlow_Title @@ -124,7 +138,7 @@ Column { id: _DialysateInletFlowColumn width : 150 spacing : 20 - topPadding : 100 + topPadding : 75 leftPadding : 200 Text { id: _DialysateInletFlow_Title @@ -158,7 +172,7 @@ Column { id: _DialysateOutletFlowColumn width : 150 spacing : 20 - topPadding : 100 + topPadding : 75 leftPadding : 400 Text { id: _DialysateOutletFlow_Title @@ -192,7 +206,7 @@ Column { id: _PressureOcclusionColumn width : 150 spacing : 20 - topPadding : 100 + topPadding : 75 leftPadding : 600 Text { id: _PressureOcclusion_Title @@ -220,76 +234,4 @@ } } } - - Column { id: _LoadCellReadingsColumn - width : 150 - spacing : 20 - topPadding : 100 - leftPadding : 800 - Text { - id: _LoadCellReading_Title - text: qsTr(" LoadCl ") - width: _LoadCellReadingsColumn.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 { - objectName: "_LoadCellReadings" + index - text: modelData - width: _LoadCellReadingsColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } - - Column { id: _TemperatureSensorsColumn - width : 150 - spacing : -5 - topPadding : 100 - leftPadding : 1000 - Text { - id: _TemperatureSensors_Title - text: qsTr(" Temp ") - width: _TemperatureSensorsColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - font.underline: true - } - Repeater { - model: [ - vTemperatureSensors.inletPrimaryHeater .toFixed(2) , - vTemperatureSensors.outletPrimaryHeater .toFixed(2) , - vTemperatureSensors.conductivitySensor1 .toFixed(2) , - vTemperatureSensors.conductivitySensor2 .toFixed(2) , - vTemperatureSensors.outletRedundancy .toFixed(2) , - vTemperatureSensors.inletDialysate .toFixed(2) , - vTemperatureSensors.primaryHeaterThermoCouple .toFixed(2) , - vTemperatureSensors.trimmerHeaterThermoCouple .toFixed(2) , - vTemperatureSensors.primaryHeaterColdJunction .toFixed(2) , - vTemperatureSensors.trimmerHeaterColdJunction .toFixed(2) , - vTemperatureSensors.primaryHeaterInternal .toFixed(2) , - vTemperatureSensors.trimmerHeaterInternal .toFixed(2) - ] - Text { - objectName: "_TemperatureSensors" + index - text: modelData - width: _TemperatureSensorsColumn.width - horizontalAlignment: Text.AlignRight - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - } - } }