Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision d2035a8728794afeefaa244bf8d1597926d945f5) @@ -17,21 +17,320 @@ import QtQuick 2.12 // Project +import Gui.Actions 0.1; + // Qml imports import "qrc:/globals" import "qrc:/components" +//// The original code kept for later use +// ScreenItem { id: _root +// Column { +// spacing: Variables.columnSpacing +// anchors.centerIn: parent +// TitleText { id: _titleText +// width: parent.width +// text: qsTr("Manager Home Placeholder") +// } +// } +// } + /*! * \brief ManagerHome is the screen * which is the default screen in the "Manager" stack */ ScreenItem { id: _root - Column { - spacing: Variables.columnSpacing - anchors.centerIn: parent - TitleText { id: _titleText - width: parent.width - text: qsTr("Manager Home Placeholder") + + Text { id : _titleText + visible: true + anchors { + top : parent.top + left : parent.horizontalCenter + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + horizontalCenter: parent.horizontalCenter } + text: qsTr("~ DG ~") + horizontalAlignment: Text.horizontalCenter + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle } + + Column { id: _DGROPumpColumn + width : 150 + spacing : -5 + topPadding : 75 + leftPadding : 50 + Text { + id: _DGROPump_Title + text: qsTr(" ROPmp ") + width: _DGROPumpColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vDGROPump.pressure , + vDGROPump.flowRate .toFixed(2) , + vDGROPump.pwm .toFixed(2) + ] + Text { + objectName: "_DGROPumpData" + index + text: modelData + width: _DGROPumpColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + + Column { id: _DGPressuresColumn + width : 150 + spacing : -5 + topPadding : 75 + leftPadding : 250 + Text { + id: _DGPressures_Title + text: qsTr(" Prssr ") + width: _DGPressuresColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vDGPressures.roInletPSI .toFixed(2) , + vDGPressures.roOutletPSI .toFixed(2) , + vDGPressures.drainInletPSI .toFixed(2) , + vDGPressures.drainOutletPSI .toFixed(2) + ] + Text { + objectName: "_DGPressuresData" + index + text: modelData + width: _DGPressuresColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + Column { id: _DGReservoirColumn + width : 150 + spacing : -5 + topPadding : 75 + leftPadding : 450 + Text { + id: _DGReservoir_Title + text: qsTr(" Rsrvr ") + width: _DGReservoirColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vDGReservoir.activeReservoir , + vDGReservoir.fillToVol , + vDGReservoir.drainToVol , + ] + Text { + objectName: "_DGReservoirData" + index + text: modelData + width: _DGReservoirColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + Column { id: _DGHeatersColumn + width : 150 + spacing : -5 + topPadding : 75 + leftPadding : 650 + Text { + id: _DGHeaters_Title + text: qsTr(" Heatrs ") + width: _DGHeatersColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vDGHeaters.mainPrimaryDC , + vDGHeaters.smallPrimaryDC , + vDGHeaters.trimmerDC , + ] + Text { + objectName: "_DGHeatersData" + index + text: modelData + width: _DGHeatersColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + Column { id: _LoadCellReadingsColumn + width : 150 + spacing : -5 + topPadding : 75 + leftPadding : 850 + 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: [ + vDGLoadCellReadings.reservoir1Prim .toFixed(2) , + vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , + vDGLoadCellReadings.reservoir2Prim .toFixed(2) , + vDGLoadCellReadings.reservoir2Bkup .toFixed(2) + ] + Text { + objectName: "_DGLoadCellReadingsData" + index + text: modelData + width: _LoadCellReadingsColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + Column { id: _DGTemperaturesColumn + width : 150 + spacing : -5 + topPadding : 75 + leftPadding : 1050 + Text { + id: _DGTemperatures_Title + text: qsTr(" Tmprtr ") + width: _DGTemperaturesColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vDGTemperatures.inletPrimaryHeater .toFixed(2) , + vDGTemperatures.outletPrimaryHeater .toFixed(2) , + vDGTemperatures.conductivitySensor1 .toFixed(2) , + vDGTemperatures.conductivitySensor2 .toFixed(2) , + vDGTemperatures.outletRedundancy .toFixed(2) , + vDGTemperatures.inletDialysate .toFixed(2) , + vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , + vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , + vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , + vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , + vDGTemperatures.primaryHeaterInternal .toFixed(2) , + vDGTemperatures.trimmerHeaterInternal .toFixed(2) + ] + Text { + objectName: "_DGTemperaturesData" + index + text: modelData + width: _DGTemperaturesColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + // Row 2 + Column { id: _DGDrainPumpColumn + width : 150 + spacing : -5 + topPadding : 375 + leftPadding : 50 + Text { + id: _DGDrainPump_Title + text: qsTr(" DrnPmp ") + width: _DGDrainPumpColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vDGDrainPump.rpm , + vDGDrainPump.dac , + ] + Text { + objectName: "_DGDrainPumpData" + index + text: modelData + width: _DGDrainPumpColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + + // Row 3 + Column { id: _DGValvesStatesColumn + width : 300 + spacing : -5 + topPadding : 575 + leftPadding : 50 + Text { + id: _DGValvesStates_Title + text: qsTr(" Valves ") + width: _DGValvesStatesColumn.width + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Text { + objectName: "_DGValvesStatesData" + text: vDGValvesStates.text + width: _DGValvesStatesColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + + Column { id: _DGOperationModeColumn + width : 300 + spacing : -5 + topPadding : 575 + leftPadding : 450 + Text { + id: _DGOperationMode_Title + text: qsTr(" Op Mode ") + width: _DGOperationModeColumn.width + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Text { + objectName: "_DGOperationModeData" + text: vDGOperationMode.text + width: _DGOperationModeColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + }