Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r3229695c1c67de600c095d52c6f99dacfafb462d -r1b24a85761c65a685fac98f396e244af97b94443 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 3229695c1c67de600c095d52c6f99dacfafb462d) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 1b24a85761c65a685fac98f396e244af97b94443) @@ -29,7 +29,7 @@ */ ModalDialog { id: _root - width : Variables.applicationWidth - 40 + width : Variables.applicationWidth // - 40 height : Variables.applicationHeight - 60 function col(idx, gap = 0) { @@ -68,6 +68,11 @@ vDGROPump.pwm .toFixed(2) , vDGROPump.state ] + label: [ + "prsr", + "flow", + "pwm", + "stt"] textObjectName: "_DGROPumpData" } @@ -81,6 +86,12 @@ vDGDrainPump.state , vDGDrainPump.rpmo ] + label: [ + "rpmi", + "dac", + "stt", + "rpmo", + ] textObjectName: "_DGDrainPumpData" } @@ -94,6 +105,12 @@ vDGPressures.drainInletPSI .toFixed(2) , vDGPressures.drainOutletPSI .toFixed(2) ] + label: [ + "roIPSI", + "roOPSI", + "drnIPSI", + "drnOPSI", + ] textObjectName: "_DGPressuresData" } @@ -106,6 +123,11 @@ vDGReservoir.fillToVol , vDGReservoir.drainToVol , ] + label: [ + "actRsvr", + "fil2Vol", + "drn2Vol", + ] textObjectName: "_DGReservoirData" } @@ -118,6 +140,11 @@ vDGHeaters.smallPrimaryDC .toFixed(2), vDGHeaters.trimmerDC .toFixed(2), ] + label: [ + "mainPrmDC", + "smllPrmDC", + "trimmerDC", + ] textObjectName: "_DGHeatersData" } @@ -131,6 +158,12 @@ vDGLoadCellReadings.reservoir2Prim .toFixed(2) , vDGLoadCellReadings.reservoir2Bkup .toFixed(2) ] + label: [ + "rsvrPrm1", + "rsvrBkp1", + "rsvrPrm2", + "rsvrBkp2", + ] textObjectName: "_DGLoadCellReadingsData" } @@ -152,6 +185,20 @@ vDGTemperatures.primaryHeaterInternal .toFixed(2) , vDGTemperatures.trimmerHeaterInternal .toFixed(2) ] + label: [ + "iPrmHtr", + "oPrmHtr", + "condSn1", + "condSn2", + "oRdndcy", + "iDlyste", + "prmHtrThrmCple", + "trmHtrThrmCple", + "prmHtrCldJnctn", + "trmHtrCldJnctn", + "prmHtrIntrnl", + "trmHtrIntrnl", + ] textObjectName: "_DGTemperaturesData" } @@ -187,6 +234,16 @@ "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , "%" + vTreatmentBloodFlow.bloodFlow_SigStrength .toFixed(2) ] + label: [ + "FlowStPt ", + "MsrdFlow ", + "RotSpd ", + "MotSpd ", + "MotCtlSpd ", + "MotCtlCrnt", + "PWMDtCycle", + "SigStrngth", + ] textObjectName: "_HDBloodFlowData" } @@ -204,6 +261,16 @@ "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , "%" + vTreatmentDialysateFlow.dialysateFlow_SigStrength .toFixed(2) ] + label: [ + "FlowStPt ", + "MsrdFlow ", + "RotSpd ", + "MotSpd ", + "MotCtlSpd ", + "MotCtlCrnt", + "PWMDtCycle", + "SigStrngth", + ] textObjectName: "_HDInletFlowData" } @@ -220,6 +287,15 @@ vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) ] + label: [ + "RefUFVol", + "MsrUFVol", + "RotSpd", + "MotSpd", + "MotCtlSpd", + "MotCtlCrt", + "PWMDtCycl", + ] textObjectName: "_HDOutletFlowData" } @@ -234,6 +310,14 @@ vTreatmentPressureOcclusion.dialysateInletPumpOcclusion , vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion ] + label: [ + "aPrsr" , + "vPrsr" , + "BPO" , + "DIPO" , + "DOPO" , + ] + textObjectName: "_PressureOcclusionData" } @@ -271,6 +355,17 @@ vHDAccelerometer.yTilt .toFixed(3) , vHDAccelerometer.zTilt .toFixed(3) ] + label: [ + "x" , + "y" , + "z" , + "xMax" , + "yMax" , + "zMax" , + "xTilt" , + "yTilt" , + "zTilt" , + ] textObjectName: "_HDAccelerometerData" } @@ -289,6 +384,17 @@ vDGAccelerometer.yTilt .toFixed(3) , vDGAccelerometer.zTilt .toFixed(3) ] + label: [ + "x" , + "y" , + "z" , + "xMax" , + "yMax" , + "zMax" , + "xTilt" , + "yTilt" , + "zTilt" , + ] textObjectName: "_DGAccelerometerData" }