Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r3229695c1c67de600c095d52c6f99dacfafb462d -r30eab37f37822513f07948fb47a8af612d06e5f3 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 3229695c1c67de600c095d52c6f99dacfafb462d) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 30eab37f37822513f07948fb47a8af612d06e5f3) @@ -29,7 +29,7 @@ */ ModalDialog { id: _root - width : Variables.applicationWidth - 40 + width : Variables.applicationWidth // - 40 height : Variables.applicationHeight - 60 function col(idx, gap = 0) { @@ -61,26 +61,37 @@ 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: [ + "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: [ + "TgtSpd", + "DAC", + "stt", + "Spd", + ] textObjectName: "_DGDrainPumpData" } @@ -94,6 +105,12 @@ vDGPressures.drainInletPSI .toFixed(2) , vDGPressures.drainOutletPSI .toFixed(2) ] + label: [ + "PPi", + "PPo", + "PRd", + "PDr", + ] textObjectName: "_DGPressuresData" } @@ -106,6 +123,11 @@ vDGReservoir.fillToVol , vDGReservoir.drainToVol , ] + label: [ + "Act", + "Fil", + "Drn", + ] textObjectName: "_DGReservoirData" } @@ -118,6 +140,11 @@ vDGHeaters.smallPrimaryDC .toFixed(2), vDGHeaters.trimmerDC .toFixed(2), ] + label: [ + "HP1", + "HP2", + "HR", + ] textObjectName: "_DGHeatersData" } @@ -131,6 +158,12 @@ vDGLoadCellReadings.reservoir2Prim .toFixed(2) , vDGLoadCellReadings.reservoir2Bkup .toFixed(2) ] + label: [ + "A1", + "A2", + "B1", + "B2", + ] textObjectName: "_DGLoadCellReadingsData" } @@ -152,6 +185,20 @@ vDGTemperatures.primaryHeaterInternal .toFixed(2) , vDGTemperatures.trimmerHeaterInternal .toFixed(2) ] + label: [ + "TPi", + "TPo", + "TD1", + "TD2", + "TRo", + "TDi", + "HP.Trm", + "HR.Trm", + "HP.CJ", + "HR.CJ", + "HP.Int", + "HR.Int", + ] textObjectName: "_DGTemperaturesData" } @@ -176,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) , @@ -187,13 +234,23 @@ "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , "%" + vTreatmentBloodFlow.bloodFlow_SigStrength .toFixed(2) ] + label: [ + "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) , @@ -204,13 +261,23 @@ "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , "%" + vTreatmentDialysateFlow.dialysateFlow_SigStrength .toFixed(2) ] + label: [ + "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) , @@ -220,6 +287,15 @@ vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) ] + label: [ + "UFRef", + "UFMeas", + "Rot.Spd", + "Mot.Spd", + "MC.Spd", + "MC.Cur", + "PWM", + ] textObjectName: "_HDOutletFlowData" } @@ -234,6 +310,14 @@ vTreatmentPressureOcclusion.dialysateInletPumpOcclusion , vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion ] + label: [ + "PBA" , + "PBo" , + "OB" , + "ODi" , + "ODo" , + ] + textObjectName: "_PressureOcclusionData" } @@ -271,6 +355,17 @@ vHDAccelerometer.yTilt .toFixed(3) , vHDAccelerometer.zTilt .toFixed(3) ] + label: [ + "x" , + "y" , + "z" , + "xMax" , + "yMax" , + "zMax" , + "x°" , + "y°" , + "z°" , + ] textObjectName: "_HDAccelerometerData" } @@ -289,6 +384,17 @@ vDGAccelerometer.yTilt .toFixed(3) , vDGAccelerometer.zTilt .toFixed(3) ] + label: [ + "x" , + "y" , + "z" , + "xMax" , + "yMax" , + "zMax" , + "x°" , + "y°" , + "z°" , + ] textObjectName: "_DGAccelerometerData" }