Index: leahi.pro =================================================================== diff -u -r32a7b4d52315019d125c6c7b728bf0d215919c0f -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- leahi.pro (.../leahi.pro) (revision 32a7b4d52315019d125c6c7b728bf0d215919c0f) +++ leahi.pro (.../leahi.pro) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -237,7 +237,6 @@ sources/view/fp/data/VFPPressuresData.h \ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPTemperatureData.h \ - sources/view/hd/data/VTreatmentRanges.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/td/data/VTDAirBubbleData.h \ Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -35,43 +35,45 @@ property bool isOpened : false width : _column.implicitWidth - height : isTouchRect || isOpened ? _column.implicitHeight + 15 : 30 - radius : 8.5 + height : isTouchRect || isOpened ? _column.implicitHeight + 10 : _column.headerHeight + radius : 12 color : Colors.panelBackgroundColor - clip: true + clip : true border { width: 1 color: Colors.panelBorderColor } + MouseArea { + anchors.fill : parent + onClicked : { + _root.isOpened = ! _root.isOpened + } + } + Column { id: _column + property alias headerHeight: _header.height Rectangle { id: _header width : _column.width - height : _title.implicitHeight + height : _title.implicitHeight + 10 color : "#3A5A7B" - radius : 8.5 + radius : 6 visible : _title.text.length > 0 border { width: 1 color: "#6B7C8F" } + Text { id: _title text : _root.title horizontalAlignment : _root.horizontalAlignmentTitle color : Colors.offWhite font.pixelSize : fontPixelSizeTitle font.family : Fonts.fontFamilyFixed - anchors.fill : parent + anchors.centerIn : parent } - - MouseArea { - anchors.fill : parent - onClicked : { - _root.isOpened = ! _root.isOpened - } - } } Repeater { id: _repeater @@ -83,7 +85,7 @@ columns : 2 columnSpacing : 5 width : _text.implicitWidth + _value.width + leftPadding * 2 // content width + left and right padding - height : ( isTouchRect ? _value.implicitHeight : _text.implicitHeight + 1 ) + height : isTouchRect ? _value.implicitHeight : _text.implicitHeight + 1 leftPadding : 10 rightPadding : leftPadding Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -72,9 +72,9 @@ } ListModel { id: _diagnosticsModel - ListElement { text: qsTr("Treatment Delivery & Blood Handling") ; visible: true } - ListElement { text: qsTr("Dialysate Delivery") ; visible: true } - ListElement { text: qsTr("Filtration & Purification") ; visible: true } + ListElement { text: qsTr("TD & Blood Handling") ; visible: true } + ListElement { text: qsTr("DD") ; visible: true } + ListElement { text: qsTr("FP") ; visible: true } } ListView { id: _listView Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml (.../DiagnosticsBase.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml (.../DiagnosticsBase.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -31,7 +31,7 @@ ContentArea { id : _contentArea anchors { top : parent.top - topMargin : Variables.defaultMargin * 4 + topMargin : Variables.mainMenuHeight + Variables.defaultMargin left : _root.left right : _root.right bottom : _root.bottom Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -27,218 +27,217 @@ */ DiagnosticsBase { id: _root objectName : "_DiagnosticsDD" - spacing : Variables.defaultMargin contentItem : Item { id: _content DebugDataColumn { id: _DDConcentratePumpColumn - textObjectName :"_DDConcentratePumpData" - title : qsTr(" Conc Pump ") - anchors { - top : parent.top - left : parent.left - } - model: [ - vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D10PumpTargetRevCount , - vDDConcentratePump.D10PumpMeasuredRevCount , - vDDConcentratePump.D10PumpState , - vDDConcentratePump.D10PumpPulseUS .toFixed(2) , - vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , - vDDConcentratePump.D10PumpParked , - vDDConcentratePump.D10PumpParkFault , - vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D11PumpTargetRevCount , - vDDConcentratePump.D11PumpMeasuredRevCount , - vDDConcentratePump.D11PumpState , - vDDConcentratePump.D11PumpPulseUS .toFixed(2) , - vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , - vDDConcentratePump.D11PumpParked , - vDDConcentratePump.D11PumpParkFault , - vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D76PumpTargetRevCount , - vDDConcentratePump.D76PumpMeasuredRevCount , - vDDConcentratePump.D76PumpState , - vDDConcentratePump.D76PumpPulseUS .toFixed(2) , - vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , - ] - label: [ - "sSpd (D10) ", - "mSpd (D10) ", - "rCnt (D10) ", - "mCnt (D10) ", - "State (D10) ", - "Plse (D10) ", - "tSpd (D10) ", - "park (D10) ", - "pfault (D10) ", - "sSpd (D11) ", - "mSpd (D11) ", - "rCnt (D11) ", - "mCnt (D11) ", - "State (D11) ", - "Plse (D11) ", - "tSpd (D11) ", - "park (D11) ", - "pfault (D11) ", - "sSpd (D76) ", - "mSpd (D76) ", - "rCnt (D76) ", - "mCnt (D76) ", - "State (D76) ", - "Plse (D76) ", - "tSpd (D76) ", - ] + textObjectName :"_DDConcentratePumpData" + title : qsTr(" Conc Pump ") + anchors { + top : parent.top + left : parent.left } + model: [ + vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D10PumpTargetRevCount , + vDDConcentratePump.D10PumpMeasuredRevCount , + vDDConcentratePump.D10PumpState , + vDDConcentratePump.D10PumpPulseUS .toFixed(2) , + vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpParked , + vDDConcentratePump.D10PumpParkFault , + vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D11PumpTargetRevCount , + vDDConcentratePump.D11PumpMeasuredRevCount , + vDDConcentratePump.D11PumpState , + vDDConcentratePump.D11PumpPulseUS .toFixed(2) , + vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpParked , + vDDConcentratePump.D11PumpParkFault , + vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D76PumpTargetRevCount , + vDDConcentratePump.D76PumpMeasuredRevCount , + vDDConcentratePump.D76PumpState , + vDDConcentratePump.D76PumpPulseUS .toFixed(2) , + vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , + ] + label: [ + "sSpd (D10) ", + "mSpd (D10) ", + "rCnt (D10) ", + "mCnt (D10) ", + "State (D10) ", + "Plse (D10) ", + "tSpd (D10) ", + "park (D10) ", + "pfault (D10) ", + "sSpd (D11) ", + "mSpd (D11) ", + "rCnt (D11) ", + "mCnt (D11) ", + "State (D11) ", + "Plse (D11) ", + "tSpd (D11) ", + "park (D11) ", + "pfault (D11) ", + "sSpd (D76) ", + "mSpd (D76) ", + "rCnt (D76) ", + "mCnt (D76) ", + "State (D76) ", + "Plse (D76) ", + "tSpd (D76) ", + ] + } DebugDataColumn { id: _DDDialysatePumpColumn - textObjectName :"_DDDialysatePumpData" - title : qsTr(" Dial Pump ") - anchors { - top : parent.top - left : _DDConcentratePumpColumn.right - leftMargin : spacing - } - model: [ - vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , - vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , - vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , - vDDDialysatePump.D12PumpState , - vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , - vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , - vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , - vDDDialysatePump.D12PumpControl , - vDDDialysatePump.D12PumpDirErrCnt , - vDDDialysatePump.D12PumpMeasuredDir , - vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , - vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , - vDDDialysatePump.D48PumpState , - vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , - vDDDialysatePump.D48PumpControl , - vDDDialysatePump.D48PumpDirErrCnt , - vDDDialysatePump.D48PumpMeasuredDir , - ] - label: [ - "tRPM (D12) ", - "mSpd (D12) ", - "cSpd (D12) ", - "State (D12) ", - "tPres (D12) ", - "mPres (D12) ", - "Ctrl (D12) ", - "eCnt (D12) ", - "mCurr (D12) ", - "mDir (D12) ", - "tRPM (D48) ", - "mSpd (D48) ", - "cSpd (D48) ", - "State (D48) ", - "tPres (D48) ", - "mPres (D48) ", - "mCurr (D48) ", - "Ctrl (D48) ", - "eCnt (D48) ", - "mDir (D48) ", - ] + textObjectName :"_DDDialysatePumpData" + title : qsTr(" Dial Pump ") + anchors { + top : parent.top + left : _DDConcentratePumpColumn.right + leftMargin : spacing } + model: [ + vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D12PumpState , + vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D12PumpControl , + vDDDialysatePump.D12PumpDirErrCnt , + vDDDialysatePump.D12PumpMeasuredDir , + vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D48PumpState , + vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D48PumpControl , + vDDDialysatePump.D48PumpDirErrCnt , + vDDDialysatePump.D48PumpMeasuredDir , + ] + label: [ + "tRPM (D12) ", + "mSpd (D12) ", + "cSpd (D12) ", + "State (D12) ", + "tPres (D12) ", + "mPres (D12) ", + "Ctrl (D12) ", + "eCnt (D12) ", + "mCurr (D12) ", + "mDir (D12) ", + "tRPM (D48) ", + "mSpd (D48) ", + "cSpd (D48) ", + "State (D48) ", + "tPres (D48) ", + "mPres (D48) ", + "mCurr (D48) ", + "Ctrl (D48) ", + "eCnt (D48) ", + "mDir (D48) ", + ] + } DebugDataColumn { id: _DDHeatersColumn - textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") - anchors { - top : parent.top - left : _DDDialysatePumpColumn.right - leftMargin : spacing - } - model: [ - vDDHeaters.mainPrimayHeaterDC .toFixed(2) , - vDDHeaters.primaryTargetTemp .toFixed(2) , - vDDHeaters.primaryHeaterState , - vDDHeaters.primaryHeaterIntervalCount , - vDDHeaters.trimmerHeaterDC .toFixed(2) , - vDDHeaters.trimmerTargetTemp .toFixed(2) , - vDDHeaters.trimmerHeaterState , - vDDHeaters.trimmerHeaterIntervalCount , - vDDHeaters.dbg1 .toFixed(2) , - vDDHeaters.dbg2 .toFixed(2) , - vDDHeaters.dbg3 .toFixed(2) , - vDDHeaters.dbg4 .toFixed(2) , - vDDHeaters.dbg5 .toFixed(2) , - vDDHeaters.dbg6 .toFixed(2) , - vDDHeaters.dbg7 .toFixed(2) , - vDDHeaters.dbg8 .toFixed(2) , - vDDHeaters.dbg9 .toFixed(2) , - ] - label: [ - "pHeat (D5) ", - "pTemp (D5) ", - "pState (D5) ", - "pIC (D5) ", - "tHeat (D45) ", - "tTemp (D45) ", - "tstate (D45) ", - "tIC (D45) ", - "dbg1 ", - "dbg2 ", - "dbg3 ", - "dbg4 ", - "dbg5 ", - "dbg6 ", - "dbg7 ", - "dbg8 ", - "dbg9 ", - ] + textObjectName :"_DDHeatersData" + title : qsTr(" Heaters ") + anchors { + top : parent.top + left : _DDDialysatePumpColumn.right + leftMargin : spacing } + model: [ + vDDHeaters.mainPrimayHeaterDC .toFixed(2) , + vDDHeaters.primaryTargetTemp .toFixed(2) , + vDDHeaters.primaryHeaterState , + vDDHeaters.primaryHeaterIntervalCount , + vDDHeaters.trimmerHeaterDC .toFixed(2) , + vDDHeaters.trimmerTargetTemp .toFixed(2) , + vDDHeaters.trimmerHeaterState , + vDDHeaters.trimmerHeaterIntervalCount , + vDDHeaters.dbg1 .toFixed(2) , + vDDHeaters.dbg2 .toFixed(2) , + vDDHeaters.dbg3 .toFixed(2) , + vDDHeaters.dbg4 .toFixed(2) , + vDDHeaters.dbg5 .toFixed(2) , + vDDHeaters.dbg6 .toFixed(2) , + vDDHeaters.dbg7 .toFixed(2) , + vDDHeaters.dbg8 .toFixed(2) , + vDDHeaters.dbg9 .toFixed(2) , + ] + label: [ + "pHeat (D5) ", + "pTemp (D5) ", + "pState (D5) ", + "pIC (D5) ", + "tHeat (D45) ", + "tTemp (D45) ", + "tstate (D45) ", + "tIC (D45) ", + "dbg1 ", + "dbg2 ", + "dbg3 ", + "dbg4 ", + "dbg5 ", + "dbg6 ", + "dbg7 ", + "dbg8 ", + "dbg9 ", + ] + } DebugDataColumn { id: _DDTemperatureColumn - textObjectName :"_DDTemperatureData" - title : qsTr(" Temp ") - anchors { - top : parent.top - left : _DDHeatersColumn.right - leftMargin : spacing - } - model: [ - vDDTemperatures.inletHeatExchanger .toFixed(2) , - vDDTemperatures.outletHeatExchanger .toFixed(2) , - vDDTemperatures.hydraulicsPrimaryHeater .toFixed(2) , - vDDTemperatures.trimmerHeater .toFixed(2) , - vDDTemperatures.boardTemperature .toFixed(2) , - vDDTemperatures.barometricTemperature .toFixed(2) , - vDDTemperatures.D16Conductivity .toFixed(2) , - vDDTemperatures.D28Conductivity .toFixed(2) , - vDDTemperatures.D30Conductivity .toFixed(2) , - vDDTemperatures.D44Conductivity .toFixed(2) , - vDDTemperatures.D75Conductivity .toFixed(2) , - vDDTemperatures.D4MovingAverage .toFixed(2) , - vDDTemperatures.D50MovingAverage .toFixed(2) , - vDDTemperatures.D28MovingAverage .toFixed(2) , - vDDTemperatures.D30MovingAverage .toFixed(2) , - ] - label: [ - "inHE (D1) ", - "outHE (X6) ", - "hydr (D4) ", - "trim (D50) ", - "board ", - "baro ", - "Cond (D16) ", - "Cond (D28) ", - "Cond (D30) ", - "Cond (D44) ", - "Cond (D75) ", - "mAvg (D4) ", - "mAvg (D50) ", - "mAvg (D28) ", - "mAvg (D30) ", - ] + textObjectName :"_DDTemperatureData" + title : qsTr(" Temp ") + anchors { + top : parent.top + left : _DDHeatersColumn.right + leftMargin : spacing } + model: [ + vDDTemperatures.inletHeatExchanger .toFixed(2) , + vDDTemperatures.outletHeatExchanger .toFixed(2) , + vDDTemperatures.hydraulicsPrimaryHeater .toFixed(2) , + vDDTemperatures.trimmerHeater .toFixed(2) , + vDDTemperatures.boardTemperature .toFixed(2) , + vDDTemperatures.barometricTemperature .toFixed(2) , + vDDTemperatures.D16Conductivity .toFixed(2) , + vDDTemperatures.D28Conductivity .toFixed(2) , + vDDTemperatures.D30Conductivity .toFixed(2) , + vDDTemperatures.D44Conductivity .toFixed(2) , + vDDTemperatures.D75Conductivity .toFixed(2) , + vDDTemperatures.D4MovingAverage .toFixed(2) , + vDDTemperatures.D50MovingAverage .toFixed(2) , + vDDTemperatures.D28MovingAverage .toFixed(2) , + vDDTemperatures.D30MovingAverage .toFixed(2) , + ] + label: [ + "inHE (D1) ", + "outHE (X6) ", + "hydr (D4) ", + "trim (D50) ", + "board ", + "baro ", + "Cond (D16) ", + "Cond (D28) ", + "Cond (D30) ", + "Cond (D44) ", + "Cond (D75) ", + "mAvg (D4) ", + "mAvg (D50) ", + "mAvg (D28) ", + "mAvg (D30) ", + ] + } DebugDataColumn { id: _DDPressureColumn textObjectName :"_DDPressureData" @@ -533,9 +532,8 @@ radius : 10 anchors { bottom : parent.bottom - bottomMargin : spacing right : parent.right - rightMargin : spacing + rightMargin : Variables.defaultMargin } DebugDataColumn { id: _DDVersionsColumn Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -35,8 +35,6 @@ } CloseButton { id : _closeButton - anchors.margins: Variables.defaultMargin - onClicked : { _root.close() } Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml (.../DiagnosticsFP.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -63,164 +63,164 @@ } 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 ", - ] + 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 ") - 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 ", - ] + 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 ") - 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 ", - ] + 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 ") - 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 ", - ] + 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 ") - 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 ") + anchors { + top : parent.top + left : _FPFlowColumn.right + leftMargin : spacing } + 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 ", - ] + DebugDataColumn { id: _FPConductivityColumn + textObjectName :"_FPConductivityData" + title : qsTr(" Conductivity ") + anchors { + top : _FPPressureColumn.bottom + topMargin : spacing + left : _FPPressureColumn.left } + model: [ + vFPConductivity.P9Conductivity .toFixed(2) , + vFPConductivity.P18Conductivity .toFixed(2) , + ] + label: [ + "P9 ", + "P18 ", + ] + } // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. TouchRect { @@ -230,9 +230,8 @@ radius : 10 anchors { bottom : parent.bottom - bottomMargin : spacing right : parent.right - rightMargin : spacing + rightMargin : Variables.defaultMargin } DebugDataColumn { id: _FPVersionsColumn Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml (.../DiagnosticsSwipe.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml (.../DiagnosticsSwipe.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -45,11 +45,10 @@ } width : _root.width - height : 60 isDiagnostics : true index : view.currentIndex color : Colors.transparent - titlePixelSize : 28 + titlePixelSize : 30 onItemPressed: function (vIndex) { view.currentIndex = vIndex Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -68,7 +68,7 @@ title : qsTr(" Air Trap ") anchors { top : parent.top - left : _TDBloodFlowColumn.right + left : _TDPressureOcclusionColumn.right leftMargin : spacing } @@ -96,9 +96,9 @@ textObjectName :"_TDAirPumpData" title : qsTr(" Air Pumps ") anchors { - top : parent.top - left : _TDAirTrapCoulumn.right - leftMargin : spacing + top : _TDAirTrapCoulumn.bottom + topMargin : spacing + left : _TDAirTrapCoulumn.left } model: [ @@ -116,9 +116,9 @@ textObjectName :"_TDAirBubblesData" title : qsTr(" Bubbles ") anchors { - top : _TDAirPumpColumn.bottom + top : _TDPressureOcclusionColumn.bottom topMargin : spacing - left : _TDAirPumpColumn.left + left : _TDPressureOcclusionColumn.left } model: [ @@ -137,7 +137,7 @@ title : qsTr(" Valves ") anchors { top : parent.top - left : _TDAirBubblesColumn.right + left : _TDAirTrapCoulumn.right leftMargin : spacing } model: [ @@ -283,14 +283,14 @@ ] } - DebugDataColumn { id: _TDPressureOcclusionCoulumn + DebugDataColumn { id: _TDPressureOcclusionColumn textObjectName :"_TDPressureData" title : qsTr(" Pressure ") anchors { - top : _TDAirTrapCoulumn.bottom - topMargin : spacing - left : _TDAirTrapCoulumn.left + top : parent.top + left : _TDBloodFlowColumn.right + leftMargin : spacing } model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2), @@ -326,10 +326,9 @@ textObjectName :"_TDTemperatureData" title : qsTr(" Temp ") anchors { - top : _TDAirBubblesColumn.bottom + top : _TDValvesColumn.bottom topMargin : spacing - left : _TDPressureOcclusionCoulumn.right - leftMargin : spacing + left : _TDValvesColumn.left } model: [ vTDTemperature.boardTemp .toFixed(2) @@ -343,9 +342,9 @@ textObjectName :"_TDBatteryData" title : qsTr(" Battery ") anchors { - top : _TDTemperatureCoulumn.bottom + top : _TDEjectorColumn.bottom topMargin : spacing - left : _TDTemperatureCoulumn.left + left : _TDEjectorColumn.left } model: [ vTDBattery.acPower , @@ -357,17 +356,16 @@ ] } -// // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. + // // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. TouchRect { width : _TDVersionsColumn.width height : _TDVersionsColumn.height onClicked : vAdjustmentVersions.doAdjustment() radius : 10 anchors { bottom : parent.bottom - bottomMargin : spacing right : parent.right - rightMargin : spacing + rightMargin : Variables.defaultMargin } DebugDataColumn { id: _TDVersionsColumn textObjectName :"_TDVersionsData" Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rb8a9627cf291b564b0fc1570f9c0a97fa6873035 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision b8a9627cf291b564b0fc1570f9c0a97fa6873035) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -45,7 +45,6 @@ readonly property color treatmentSectionHeader : "#1A2E42" readonly property color treatmentSectionMain : "#1A3046" readonly property color mainTreatmentLighterBlue : "#1F3D5A" - readonly property color mainTreatmentDarkerBlue : "#142C49" readonly property color mainTreatmentOrange : "#FFB836" readonly property color mainTreatmentIsoBlue : "#C3F9FF" readonly property color mainTreatmentGreen : "#BBFFA3" Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -103,8 +103,8 @@ readonly property int fontPixelInstructionStep : 30 readonly property int fontPixelDebugTitle : 25 - readonly property int fontPixelDebugText : 32 - readonly property int fontPixelDebugLabel : 20 + readonly property int fontPixelDebugText : 25 + readonly property int fontPixelDebugLabel : 18 readonly property string fontFamilyFixed : "Barlow" } Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -57,7 +57,7 @@ value : _root.progressValue thickness : 35 circleShadowColor : Colors.mainTreatmentLighterBlue - circleFillColor : Colors.mainTreatmentDarkerBlue + circleFillColor : Colors.transparent runAnimation : ! _root.isRunning MouseArea { id: _mouseArea