Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml =================================================================== diff -u -r180629277c415aeea3818dd6630f2ad8b0a009ca -r89be2d248cac3f748b704cd62408cf8911991039 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 180629277c415aeea3818dd6630f2ad8b0a009ca) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) @@ -21,21 +21,23 @@ // Qml imports import "qrc:/globals" import "qrc:/components" -import "qrc:/compounds" /*! * \brief the post treatment prime stack screen */ DiagnosticsBase { id: _root - objectName: "_DiagnosticsFP" + objectName : "_DiagnosticsFP" - title: qsTr("Filtration & Purification") + contentItem : Item { id: _content - DebugDataColumn { id: _FPPressureColumn + DebugDataColumn { id: _FPPressureColumn textObjectName :"_FPPressureData" title : qsTr(" Pressure ") - x: col(0) - y: row(0) + anchors { + top : parent.top + left : parent.left + } + model: [ vFPPressures.beforePresureRegulator .toFixed(2) , vFPPressures.afterPressureRegulator .toFixed(2) , @@ -60,164 +62,179 @@ ] } - DebugDataColumn { id: _FPROPumpColumn - textObjectName :"_FPROPumpData" - title : qsTr(" RO Pump ") - x: col(3) - y: row(0) - model: [ - vFPROPump.pumpState , - vFPROPump.pumpDutyCycle , - vFPROPump.pumpFBDutyCycle , - vFPROPump.pumpSpeed .toFixed(2) , - vFPROPump.targetPressure .toFixed(2) , - vFPROPump.targetFlow .toFixed(2) , - vFPROPump.targetDutyCycle .toFixed(2) , - vFPROPump.pumpDutyCyclePct .toFixed(2) , - vFPROPump.pumpFBDutyCyclePct .toFixed(2) , - ] - label: [ - "P12 State ", - "P12 DC ", - "P12 FBDC ", - "P12 Spd ", - "P12 tPSI ", - "P12 tFlow ", - "P12 tDC ", - "P12 DCPct ", - "P12 FBDCPct ", - ] - } + DebugDataColumn { id: _FPROPumpColumn + textObjectName :"_FPROPumpData" + title : qsTr(" RO Pump ") + anchors { + top : parent.top + left : _FPPressureColumn.right + leftMargin : spacing + } + model: [ + vFPROPump.pumpState , + vFPROPump.pumpDutyCycle , + vFPROPump.pumpFBDutyCycle , + vFPROPump.pumpSpeed .toFixed(2) , + vFPROPump.targetPressure .toFixed(2) , + vFPROPump.targetFlow .toFixed(2) , + vFPROPump.targetDutyCycle .toFixed(2) , + vFPROPump.pumpDutyCyclePct .toFixed(2) , + vFPROPump.pumpFBDutyCyclePct .toFixed(2) , + ] + label: [ + "P12 State ", + "P12 DC ", + "P12 FBDC ", + "P12 Spd ", + "P12 tPSI ", + "P12 tFlow ", + "P12 tDC ", + "P12 DCPct ", + "P12 FBDCPct ", + ] + } - DebugDataColumn { id: _FPBoostPumpColumn - textObjectName :"_FPBoostPumpData" - title : qsTr(" Boost Pump ") - x: col(4.5) - y: row(0) - model: [ - vFPBoostPump.pumpState , - vFPBoostPump.pumpDutyCycle , - vFPBoostPump.pumpFBDutyCycle , - vFPBoostPump.pumpSpeed .toFixed(2) , - vFPBoostPump.targetPressure .toFixed(2) , - vFPBoostPump.targetFlow .toFixed(2) , - vFPBoostPump.targetDutyCycle .toFixed(2) , - vFPBoostPump.pumpDutyCyclePct .toFixed(2) , - vFPBoostPump.pumpFBDutyCyclePct .toFixed(2) , - ] - label: [ - "P40 State ", - "P40 DC ", - "P40 FBDC ", - "P40 Spd ", - "P40 tPSI ", - "P40 tFlow ", - "P40 tDC ", - "P40 DCPct ", - "P40 FBDCPct ", - ] - } + DebugDataColumn { id: _FPBoostPumpColumn + textObjectName :"_FPBoostPumpData" + title : qsTr(" Boost Pump ") + anchors { + top : parent.top + left : _FPROPumpColumn.right + leftMargin : spacing + } + model: [ + vFPBoostPump.pumpState , + vFPBoostPump.pumpDutyCycle , + vFPBoostPump.pumpFBDutyCycle , + vFPBoostPump.pumpSpeed .toFixed(2) , + vFPBoostPump.targetPressure .toFixed(2) , + vFPBoostPump.targetFlow .toFixed(2) , + vFPBoostPump.targetDutyCycle .toFixed(2) , + vFPBoostPump.pumpDutyCyclePct .toFixed(2) , + vFPBoostPump.pumpFBDutyCyclePct .toFixed(2) , + ] + label: [ + "P40 State ", + "P40 DC ", + "P40 FBDC ", + "P40 Spd ", + "P40 tPSI ", + "P40 tFlow ", + "P40 tDC ", + "P40 DCPct ", + "P40 FBDCPct ", + ] + } - DebugDataColumn { id: _FPTemperatureColumn - textObjectName :"_FPTemperatureData" - title : qsTr(" Temperature ") - x: col(6) - y: row(0) - model: [ - vFPTemperature.inletConductivityTemp .toFixed(2) , - vFPTemperature.outletConductivityTemp .toFixed(2) , - vFPTemperature.beforePressureRegulatorTemp .toFixed(2) , - vFPTemperature.afterPressureRegulatorTemp .toFixed(2) , - vFPTemperature.beforeInletConductivityTemp .toFixed(2) , - vFPTemperature.beforeROFilterTemp .toFixed(2) , - vFPTemperature.afterROFilterTemp .toFixed(2) , - vFPTemperature.beforeROPumpTemp .toFixed(2) , - vFPTemperature.ROConcentrateTemp .toFixed(2) , - vFPTemperature.ROConcentratePumpTemp .toFixed(2) , - vFPTemperature.drainDropTemp .toFixed(2) , - vFPTemperature.ROInletTemp .toFixed(2) , - vFPTemperature.ROOutletTemp .toFixed(2) , - ] - label: [ - "P10 inCond ", - "P19 outCond ", - "M1 bReg ", - "M3 aReg ", - "P8 bInCond ", - "P13 bRO ", - "P17 aRO ", - "X1 bROPump ", - "X2 ROConc ", - "X3 ROConcPump ", - "X4 Drain ", - "P7 ROIn ", - "P16 ROOut ", - ] - } + DebugDataColumn { id: _FPTemperatureColumn + textObjectName :"_FPTemperatureData" + title : qsTr(" Temperature ") + anchors { + top : parent.top + left : _FPBoostPumpColumn.right + leftMargin : spacing + } + model: [ + vFPTemperature.inletConductivityTemp .toFixed(2) , + vFPTemperature.outletConductivityTemp .toFixed(2) , + vFPTemperature.beforePressureRegulatorTemp .toFixed(2) , + vFPTemperature.afterPressureRegulatorTemp .toFixed(2) , + vFPTemperature.beforeInletConductivityTemp .toFixed(2) , + vFPTemperature.beforeROFilterTemp .toFixed(2) , + vFPTemperature.afterROFilterTemp .toFixed(2) , + vFPTemperature.beforeROPumpTemp .toFixed(2) , + vFPTemperature.ROConcentrateTemp .toFixed(2) , + vFPTemperature.ROConcentratePumpTemp .toFixed(2) , + vFPTemperature.drainDropTemp .toFixed(2) , + vFPTemperature.ROInletTemp .toFixed(2) , + vFPTemperature.ROOutletTemp .toFixed(2) , + ] + label: [ + "P10 inCond ", + "P19 outCond ", + "M1 bReg ", + "M3 aReg ", + "P8 bInCond ", + "P13 bRO ", + "P17 aRO ", + "X1 bROPump ", + "X2 ROConc ", + "X3 ROConcPump ", + "X4 Drain ", + "P7 ROIn ", + "P16 ROOut ", + ] + } - DebugDataColumn { id: _FPFlowColumn - textObjectName :"_FPFlowData" - title : qsTr(" Flow ") - x: col(7.5) - y: row(0) - model: [ - vFPFlow.waterInletFlow .toFixed(2) , - vFPFlow.waterInletTemp .toFixed(2) , - vFPFlow.rOFilterOutletFlow .toFixed(2) , - vFPFlow.rOFilterOutletTemp .toFixed(2) , - ] - label: [ - "P7 FlowIn ", - "P7 TempIn ", - "P16 FlowOut ", - "P16 TempOut ", - ] - } + DebugDataColumn { id: _FPFlowColumn + textObjectName :"_FPFlowData" + title : qsTr(" Flow ") + anchors { + top : parent.top + left : _FPTemperatureColumn.right + leftMargin : spacing + } + model: [ + vFPFlow.waterInletFlow .toFixed(2) , + vFPFlow.waterInletTemp .toFixed(2) , + vFPFlow.rOFilterOutletFlow .toFixed(2) , + vFPFlow.rOFilterOutletTemp .toFixed(2) , + ] + label: [ + "P7 FlowIn ", + "P7 TempIn ", + "P16 FlowOut ", + "P16 TempOut ", + ] + } - DebugDataColumn { id: _FPConductivityColumn - textObjectName :"_FPConductivityData" - title : qsTr(" Conductivity ") - x: col(9) - y: row(0) - model: [ - vFPConductivity.P9Conductivity .toFixed(2) , - vFPConductivity.P18Conductivity .toFixed(2) , - ] - label: [ - "P9 ", - "P18 ", - ] - } + DebugDataColumn { id: _FPConductivityColumn + textObjectName :"_FPConductivityData" + title : qsTr(" Conductivity ") + anchors { + top : parent.top + left : _FPFlowColumn.right + leftMargin : spacing + } + model: [ + vFPConductivity.P9Conductivity .toFixed(2) , + vFPConductivity.P18Conductivity .toFixed(2) , + ] + label: [ + "P9 ", + "P18 ", + ] + } - DebugDataColumn { id: _FPLevelColumn - textObjectName :"_FPLevelData" - title : qsTr(" Level ") - x: col(9) - y: row(1) - model: [ - vFPLevel.P25FloaterLevel , - ] - label: [ - "P25 Floater ", - ] - } + DebugDataColumn { id: _FPLevelColumn + textObjectName :"_FPLevelData" + title : qsTr(" Level ") + anchors { + top : _FPConductivityColumn.bottom + topMargin : spacing + left : _FPConductivityColumn.left + } + model: [ + vFPLevel.P25FloaterLevel , + ] + label: [ + "P25 Floater ", + ] + } - // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. - TouchRect { - x : col(9.0) - y : row(8.0) - width : 425 - height : 80 - onClicked : vAdjustmentVersions.doAdjustment() - radius : 10 - Column { - anchors.top : parent.top - anchors.topMargin: -20 - anchors.left: parent.left - anchors.leftMargin: 5 + // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. + TouchRect { + width : _FPVersionsColumn.width + height : _FPVersionsColumn.height + onClicked : vAdjustmentVersions.doAdjustment() + radius : 10 + anchors { + bottom : parent.bottom + bottomMargin : spacing + right : parent.right + rightMargin : spacing + } - spacing: -30 - DebugDataColumn { id: _FPVersionsColumn textObjectName :"_FPVersionsData" title : "" @@ -238,7 +255,6 @@ } } - Connections { target: _GuiView function onDidActionReceive( vAction, vData ) { // DEBUG: console.debug("onDidActionReceive", vAction, vData)