Index: sources/gui/qml/components/DebugDataColumn.qml =================================================================== diff -u -r1b24a85761c65a685fac98f396e244af97b94443 -r30eab37f37822513f07948fb47a8af612d06e5f3 --- sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 1b24a85761c65a685fac98f396e244af97b94443) +++ sources/gui/qml/components/DebugDataColumn.qml (.../DebugDataColumn.qml) (revision 30eab37f37822513f07948fb47a8af612d06e5f3) @@ -56,7 +56,7 @@ text : (index < _root.label.length) ? _root.label[index] : "" // width : 5 color : Colors.textMain - font.pixelSize : 10 + font.pixelSize : 15 anchors.baseline: parent.baseline anchors.left : parent.right horizontalAlignment: Text.AlignLeft Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r1b24a85761c65a685fac98f396e244af97b94443 -r30eab37f37822513f07948fb47a8af612d06e5f3 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 1b24a85761c65a685fac98f396e244af97b94443) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 30eab37f37822513f07948fb47a8af612d06e5f3) @@ -61,36 +61,36 @@ DebugDataColumn { id: _DGROPumpColumn x: col(0) y: row(0) - title: qsTr(" ROPmp ") + title: qsTr(" ROP ") model: [ vDGROPump.pressure .toFixed(2) , vDGROPump.flowRate .toFixed(2) , vDGROPump.pwm .toFixed(2) , vDGROPump.state ] label: [ - "prsr", - "flow", - "pwm", + "MaxPrs", + "Flow", + "PWM", "stt"] textObjectName: "_DGROPumpData" } DebugDataColumn { id: _DGDrainPumpColumn x: col(1) y: row(0) - title: qsTr(" DRPmp ") + title: qsTr(" DRP ") model: [ vDGDrainPump.rpmi , vDGDrainPump.dac , vDGDrainPump.state , vDGDrainPump.rpmo ] label: [ - "rpmi", - "dac", + "TgtSpd", + "DAC", "stt", - "rpmo", + "Spd", ] textObjectName: "_DGDrainPumpData" } @@ -106,10 +106,10 @@ vDGPressures.drainOutletPSI .toFixed(2) ] label: [ - "roIPSI", - "roOPSI", - "drnIPSI", - "drnOPSI", + "PPi", + "PPo", + "PRd", + "PDr", ] textObjectName: "_DGPressuresData" } @@ -124,9 +124,9 @@ vDGReservoir.drainToVol , ] label: [ - "actRsvr", - "fil2Vol", - "drn2Vol", + "Act", + "Fil", + "Drn", ] textObjectName: "_DGReservoirData" } @@ -141,9 +141,9 @@ vDGHeaters.trimmerDC .toFixed(2), ] label: [ - "mainPrmDC", - "smllPrmDC", - "trimmerDC", + "HP1", + "HP2", + "HR", ] textObjectName: "_DGHeatersData" } @@ -159,10 +159,10 @@ vDGLoadCellReadings.reservoir2Bkup .toFixed(2) ] label: [ - "rsvrPrm1", - "rsvrBkp1", - "rsvrPrm2", - "rsvrBkp2", + "A1", + "A2", + "B1", + "B2", ] textObjectName: "_DGLoadCellReadingsData" } @@ -186,18 +186,18 @@ vDGTemperatures.trimmerHeaterInternal .toFixed(2) ] label: [ - "iPrmHtr", - "oPrmHtr", - "condSn1", - "condSn2", - "oRdndcy", - "iDlyste", - "prmHtrThrmCple", - "trmHtrThrmCple", - "prmHtrCldJnctn", - "trmHtrCldJnctn", - "prmHtrIntrnl", - "trmHtrIntrnl", + "TPi", + "TPo", + "TD1", + "TD2", + "TRo", + "TDi", + "HP.Trm", + "HR.Trm", + "HP.CJ", + "HR.CJ", + "HP.Int", + "HR.Int", ] textObjectName: "_DGTemperaturesData" } @@ -223,7 +223,7 @@ DebugDataColumn { id: _HDBloodFlowColumn x: col(0) y: row(2.8) - title: qsTr(" Blood ") + title: qsTr(" BP ") model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -235,22 +235,22 @@ "%" + vTreatmentBloodFlow.bloodFlow_SigStrength .toFixed(2) ] label: [ - "FlowStPt ", - "MsrdFlow ", - "RotSpd ", - "MotSpd ", - "MotCtlSpd ", - "MotCtlCrnt", - "PWMDtCycle", - "SigStrngth", + "Tgt.Flow", + "Msr.Flow", + "Rot.Spd", + "Mot.Spd", + "MC.Spd", + "MC.Cur", + "PWM", + "SigS", ] textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn x: col(1.2) y: row(2.8) - title: qsTr(" Dlyst I ") + title: qsTr(" DPi ") model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -262,22 +262,22 @@ "%" + vTreatmentDialysateFlow.dialysateFlow_SigStrength .toFixed(2) ] label: [ - "FlowStPt ", - "MsrdFlow ", - "RotSpd ", - "MotSpd ", - "MotCtlSpd ", - "MotCtlCrnt", - "PWMDtCycle", - "SigStrngth", + "Tgt.Flow", + "Msr.Flow", + "Rot.Spd", + "Mot.Spd", + "MC.Spd", + "MC.Cur", + "PWM", + "SigS", ] textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn x: col(2.4) y: row(2.8) - title: qsTr(" Dlyst O ") + title: qsTr(" UF/DPo ") model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -288,13 +288,13 @@ "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) ] label: [ - "RefUFVol", - "MsrUFVol", - "RotSpd", - "MotSpd", - "MotCtlSpd", - "MotCtlCrt", - "PWMDtCycl", + "UFRef", + "UFMeas", + "Rot.Spd", + "Mot.Spd", + "MC.Spd", + "MC.Cur", + "PWM", ] textObjectName: "_HDOutletFlowData" } @@ -311,11 +311,11 @@ vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion ] label: [ - "aPrsr" , - "vPrsr" , - "BPO" , - "DIPO" , - "DOPO" , + "PBA" , + "PBo" , + "OB" , + "ODi" , + "ODo" , ] textObjectName: "_PressureOcclusionData" @@ -362,9 +362,9 @@ "xMax" , "yMax" , "zMax" , - "xTilt" , - "yTilt" , - "zTilt" , + "x°" , + "y°" , + "z°" , ] textObjectName: "_HDAccelerometerData" } @@ -391,9 +391,9 @@ "xMax" , "yMax" , "zMax" , - "xTilt" , - "yTilt" , - "zTilt" , + "x°" , + "y°" , + "z°" , ] textObjectName: "_DGAccelerometerData" }