Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file ManagerHome.qml - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 21-Oct-2019 + * \file DiagnosticsDialog.qml + * \author (last) Behrouz NematiPour + * \date (last) 10-Feb-2023 + * \author (original) Behrouz NematiPour + * \date (original) 11-May-2021 * */ @@ -49,6 +49,7 @@ height : width radius : width } + CloseButton { id : _closeButton anchors.left : undefined anchors.right : parent.right @@ -59,9 +60,10 @@ } DebugDataColumn { id: _DGROPumpColumn + textObjectName :"_DGROPumpData" + title : qsTr(" ROP ") x: col(0) y: row(0) - title: qsTr(" ROP ") model: [ vDGROPump.pressure .toFixed(2) , vDGROPump.flowRate .toFixed(2) , @@ -70,54 +72,63 @@ ] label: [ "MaxPrs", - "Flow", - "PWM", - "stt"] - textObjectName: "_DGROPumpData" + "Flow" , + "PWM" , + "stt" , + ] } DebugDataColumn { id: _DGDrainPumpColumn + textObjectName :"_DGDrainPumpData" + title : qsTr(" DRP ") x: col(1) y: row(0) - title: qsTr(" DRP ") model: [ - vDGDrainPump.rpmi , - vDGDrainPump.dac , - vDGDrainPump.state , - vDGDrainPump.rpmo + vDGDrainPump.rpmi , + vDGDrainPump.dac , + vDGDrainPump.state , + vDGDrainPump.rpmo , + vDGDrainPump.targetFLPMO , + vDGDrainPump.currentA , + vDGDrainPump.direction , ] label: [ "TgtSpd", - "DAC", - "stt", - "Spd", + "DAC" , + "stt" , + "Spd" , + "tgt" , + "cur" , + "dir" , ] - textObjectName: "_DGDrainPumpData" } DebugDataColumn { id: _DGPressuresColumn + textObjectName :"_DGPressuresData" + title : qsTr(" Prssr ") x: col(2) y: row(0) - title: qsTr(" Prssr ") model: [ vDGPressures.roInletPSI .toFixed(2) , vDGPressures.roOutletPSI .toFixed(2) , vDGPressures.drainInletPSI .toFixed(2) , - vDGPressures.drainOutletPSI .toFixed(2) + vDGPressures.drainOutletPSI .toFixed(2) , + vDGPressures.barometricPSI .toFixed(2) , ] label: [ "PPi", "PPo", "PRd", "PDr", + "bar", ] - textObjectName: "_DGPressuresData" } DebugDataColumn { id: _DGReservoirColumn + textObjectName :"_DGReservoirData" + title : qsTr(" Rsrvr ") x: col(3) y: row(0) - title: qsTr(" Rsrvr ") model: [ vDGReservoir.activeReservoir , vDGReservoir.fillToVol , @@ -128,51 +139,52 @@ "Fil", "Drn", ] - textObjectName: "_DGReservoirData" } DebugDataColumn { id: _DGHeatersColumn + textObjectName :"_DGHeatersData" + title : qsTr(" Heatrs ") x: col(4) y: row(0) - title: qsTr(" Heatrs ") model: [ - vDGHeaters.mainPrimaryDC .toFixed(2), - vDGHeaters.smallPrimaryDC .toFixed(2), - vDGHeaters.trimmerDC .toFixed(2), + vDGHeaters.mainPrimayHeaterDC .toFixed(2), + vDGHeaters.smallPrimaryHeaterDC .toFixed(2), + vDGHeaters.trimmerHeaterDC .toFixed(2), ] label: [ "HP1", "HP2", - "HR", + "HR" , ] - textObjectName: "_DGHeatersData" } - DebugDataColumn { id: _LoadCellReadingsColumn + DebugDataColumn { id: _DGLoadCellReadingsColumn + textObjectName :"_DGLoadCellReadingsData" + title : qsTr(" LoadCl ") x: col(5) y: row(0) - title: qsTr(" LoadCl ") model: [ vDGLoadCellReadings.reservoir1Prim .toFixed(2) , vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , vDGLoadCellReadings.reservoir2Prim .toFixed(2) , - vDGLoadCellReadings.reservoir2Bkup .toFixed(2) + vDGLoadCellReadings.reservoir2Bkup .toFixed(2) , ] label: [ "A1", "A2", "B1", "B2", ] - textObjectName: "_DGLoadCellReadingsData" } DebugDataColumn { id: _DGTemperaturesColumn + textObjectName :"_DGTemperaturesData" + title : qsTr(" Tmprtr ") x: col(6) y: row(0) - title: qsTr(" Tmprtr ") model: [ vDGTemperatures.inletPrimaryHeater .toFixed(2) , + vDGTemperatures.heatDisinfect .toFixed(2) , vDGTemperatures.outletPrimaryHeater .toFixed(2) , vDGTemperatures.conductivitySensor1 .toFixed(2) , vDGTemperatures.conductivitySensor2 .toFixed(2) , @@ -183,47 +195,112 @@ vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , vDGTemperatures.primaryHeaterInternal .toFixed(2) , - vDGTemperatures.trimmerHeaterInternal .toFixed(2) + vDGTemperatures.trimmerHeaterInternal .toFixed(2) , + vDGTemperatures.fpgaBoard .toFixed(2) , + vDGTemperatures.loadCellA1B1 .toFixed(2) , + vDGTemperatures.loadCellA2B2 .toFixed(2) , + vDGTemperatures.internalTHDORTD .toFixed(2) , + vDGTemperatures.internalTDIRTD .toFixed(2) , + vDGTemperatures.interalTHDRTD .toFixed(2) , + vDGTemperatures.internalCondSnsrTemp .toFixed(2) , + vDGTemperatures.baroTempSensor .toFixed(2) , ] label: [ - "TPi", - "TPo", - "TD1", - "TD2", - "TRo", - "TDi", + "TPi" , + "THd" , + "TPo" , + "TD1" , + "TD2" , + "TRo" , + "TDi" , "HP.Trm", "HR.Trm", - "HP.CJ", - "HR.CJ", + "HP.Cld", + "HR.Cld", "HP.Int", "HR.Int", + "fpga" , + "cell11", + "cell22", + "iTHDO" , + "iTDI" , + "iTHD" , + "iCond" , + "baro" , ] - textObjectName: "_DGTemperaturesData" } - // Next row - DebugDataColumn { id: _DGValvesStatesColumn - x: col(3.8) - y: row(5.2) - title: qsTr(" Valves ") - model: [ vDGValvesStates.text ] - textObjectName: "_DGValvesStatesData" + DebugDataColumn { id: _DGConductivityColumn + textObjectName :"_DGConductivityData" + title : qsTr(" Conduct ") + x: col(3.7) + y: row(3.2) + model: [ + vDGConductivity.RORejectionRatio .toFixed(3), + vDGConductivity.CPi .toFixed(1), + vDGConductivity.CPo .toFixed(1), + vDGConductivity.CD1 .toFixed(1), + vDGConductivity.CD2 .toFixed(1), + vDGConductivity.CPiRaw .toFixed(1), + vDGConductivity.CPoRaw .toFixed(1), + vDGConductivity.CD1Raw .toFixed(1), + vDGConductivity.CD2Raw .toFixed(1), + vDGConductivity.CPiSensorStatus .toFixed(1), + vDGConductivity.CPoSensorStatus .toFixed(1), + vDGConductivity.CD1SensorStatus .toFixed(1), + vDGConductivity.CD2SensorStatus .toFixed(1), + ] + label: [ + "ROrr" , + "CPi" , + "CPo" , + "CD1" , + "CD2" , + "CPir" , + "CPor" , + "CD1r" , + "CD2r" , + "CPis" , + "CPos" , + "CD1s" , + "CD2s" , + ] } + DebugDataColumn { id: _HDAirColumn + textObjectName :"_HDAirData" + title : qsTr("Air Status") + x: col(2.4) + y: row(5.5) + model: [ + vHDAirBubble .venousAirBubbleStatus , + vHDAirTrap .airTrapLowerLevel , + vHDAirTrap .airTrapUpperLevel , + ] + label: [ + "ADV" , + "ATll" , + "ATul" , + ] + } + DebugDataColumn { id: _DGOperationModeColumn + textObjectName :"_DGOperationModeData" + title : qsTr(" DG Mode ") x: col(2.5) - y: row(2) - title: qsTr(" DG Mode ") - model: [ vDGOperationMode.text ] - textObjectName: "_DGOperationModeData" + y: row(1.9) + model: [ + vDGOperationMode.text , + ] + fontPixelSizeText: Fonts.fontPixelDebugTitle } // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn + textObjectName :"_HDBloodFlowData" + title : qsTr(" BP ") x: col(0) - y: row(2.8) - title: qsTr(" BP ") + y: row(2.5) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -232,25 +309,25 @@ vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , - "%" + vTreatmentBloodFlow.bloodFlow_SigStrength .toFixed(2) + vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) , ] label: [ - "Tgt.Flow", - "Msr.Flow", - "Rot.Spd", - "Mot.Spd", - "MC.Spd", - "MC.Cur", - "PWM", - "SigS", + "Tgt.Flow" , + "Msr.Flow" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , + "Rtr.Cnt" , ] - textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn + textObjectName :"_HDDialysateInletFlowData" + title : qsTr(" DPi ") x: col(1.2) - y: row(2.8) - title: qsTr(" DPi ") + y: row(2.5) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -259,72 +336,71 @@ vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , "%" + 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", + "Tgt.Flow" , + "Msr.Flow" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , ] - textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn + textObjectName :"_HDDialysateOutletFlowData" + title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.8) - title: qsTr(" UF/DPo ") + y: row(2.5) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) + "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCorrOffset .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCalcRate .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_UfCalcRate .toFixed(2) , ] label: [ - "UFRef", - "UFMeas", - "Rot.Spd", - "Mot.Spd", - "MC.Spd", - "MC.Cur", - "PWM", + "UFRef" , + "UFMeas" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , + "DopOfst" , + "DopRate" , + "UFcRate" , ] - textObjectName: "_HDOutletFlowData" } DebugDataColumn { id: _HDPressureOcclusionColumn - x: col(3.6) - y: row(2.8) - title: qsTr(" Prsr Oc ") + textObjectName :"_HDPressureOcclusionData" + title : qsTr(" Prsr Oc ") + x: col(3.7) + y: row(1.9) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , vTreatmentPressureOcclusion.bloodPumpOcclusion , - vTreatmentPressureOcclusion.dialysateInletPumpOcclusion , - vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion ] label: [ "PBA" , "PBo" , - "OB" , - "ODi" , - "ODo" , + "OB" , ] - - textObjectName: "_PressureOcclusionData" } DebugDataColumn { id: _HDSyringePumpColumn + textObjectName :"_HDSyringePumpData" + title : qsTr(" Syringe ") x: col(4.6) - y: row(2) - title: qsTr(" Syringe ") + y: row(1.9) model: [ vHDSyringePump.syringePumpState , vHDSyringePump.heparinState , @@ -349,170 +425,213 @@ "Msr.Swt", "Msr.Frc", "safe.Vl", - "status", + "status" , ] - - textObjectName: "_HDSyringePumpColumn" } DebugDataColumn { id: _HDOperationModeColumn + textObjectName :"_HDOperationModeData" + title : qsTr(" HD Mode ") x: col(0.5) - y: row(2) - title: qsTr(" HD Mode ") - model: [ vHDOperationMode.text ] - textObjectName: "_HDOperationModeData" + y: row(1.9) + model: [ + vHDOperationMode.text , + ] + fontPixelSizeText: Fonts.fontPixelDebugTitle } - Text { id : _canbusFaultCountText - x: col(0) - y: row(6) - property int count: 0 - visible: true - text: qsTr("CAN Faults: %1").arg(count) - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: 38 + DebugDataColumn { id: _DGValvesStatesColumn + textObjectName :"_DGValvesStatesData" + title : qsTr("Vlv") + x: col(7.65) // pleae don't use 2 digits, this one is an exception + y: row(0.0) + width: 50 + model: [ + "%1,%2".arg(vDGValvesStates.valveStatus_VRF).arg(vDGValvesStates.valveStates_VRF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRI).arg(vDGValvesStates.valveStates_VRI), + "%1,%2".arg(vDGValvesStates.valveStatus_RES).arg(vDGValvesStates.valveStates_RES), + "%1,%2".arg(vDGValvesStates.valveStatus_VRO).arg(vDGValvesStates.valveStates_VRO), + "%1,%2".arg(vDGValvesStates.valveStatus_VPO).arg(vDGValvesStates.valveStates_VPO), + "%1,%2".arg(vDGValvesStates.valveStatus_VBF).arg(vDGValvesStates.valveStates_VBF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRC).arg(vDGValvesStates.valveStates_VRC), + "%1,%2".arg(vDGValvesStates.valveStatus_VDR).arg(vDGValvesStates.valveStates_VDR), + "%1,%2".arg(vDGValvesStates.valveStatus_VPI).arg(vDGValvesStates.valveStates_VPI), + "%1,%2".arg(vDGValvesStates.valveStatus_VSP).arg(vDGValvesStates.valveStates_VSP), + "%1,%2".arg(vDGValvesStates.valveStatus_VR1).arg(vDGValvesStates.valveStates_VR1), + "%1,%2".arg(vDGValvesStates.valveStatus_VR2).arg(vDGValvesStates.valveStates_VR2), + "%1,%2".arg(vDGValvesStates.valveStatus_VPD).arg(vDGValvesStates.valveStates_VPD), + ] + label: [ + "VRF", + "VRI", + "RES", + "VRO", + "VPO", + "VBF", + "VRC", + "VDR", + "VPI", + "VSP", + "VR1", + "VR2", + "VPD", + ] } - DebugDataColumn { id: _HDAccelerometerColumn + DebugDataColumn { id: _HDBloodLeakColumn + textObjectName :"_HDBloodLeakData" + title : qsTr(" BLD ") x: col(7) - y: row(3.2) - title: qsTr(" HD Acc ") + y: row(4.5) model: [ - vHDAccelerometer.x .toFixed(3) , - vHDAccelerometer.y .toFixed(3) , - vHDAccelerometer.z .toFixed(3) , - vHDAccelerometer.xMax .toFixed(3) , - vHDAccelerometer.yMax .toFixed(3) , - vHDAccelerometer.zMax .toFixed(3) , - vHDAccelerometer.xTilt .toFixed(3) , - vHDAccelerometer.yTilt .toFixed(3) , - vHDAccelerometer.zTilt .toFixed(3) + vHDBloodLeak.bloodLeakStatus , + vHDBloodLeak.bloodLeakState , ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "Stats" , + "State" , ] - textObjectName: "_HDAccelerometerData" } - DebugDataColumn { id: _DGAccelerometerColumn - x: col(7) - y: row(0) - title: qsTr(" DG Acc ") + DebugDataColumn { id: _HDAlarmTopColumn + textObjectName :"_HDAlarmTopData" + title : qsTr(" Alarms ") + x: col(5) + y: row(5.5) model: [ - vDGAccelerometer.x .toFixed(3) , - vDGAccelerometer.y .toFixed(3) , - vDGAccelerometer.z .toFixed(3) , - vDGAccelerometer.xMax .toFixed(3) , - vDGAccelerometer.yMax .toFixed(3) , - vDGAccelerometer.zMax .toFixed(3) , - vDGAccelerometer.xTilt .toFixed(3) , - vDGAccelerometer.yTilt .toFixed(3) , - vDGAccelerometer.zTilt .toFixed(3) + _alarmItem.alarm_AlarmID , ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "Top" , ] - textObjectName: "_DGAccelerometerData" } + // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(6) - y : row(5.8) - width : 150 - height : 35 - text.text : "Get Version" + x : col(5.0) + y : row(6.4) + width : 425 + height : 80 onClicked : vAdjustmentVersions.doAdjustment() + radius : 10 + Column { + anchors.top : parent.top + anchors.topMargin: -20 + anchors.left: parent.left + anchors.leftMargin: 5 + + spacing: -30 + DebugDataColumn { id: _HDVersionsColumn + textObjectName :"_HDVersionsData" + title : "" + horizontalAlignmentText: Text.AlignLeft + fontPixelSizeText: Fonts.fontPixelDebugTitle + model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" + .arg(vAdjustmentVersions.hdVerMajor ) + .arg(vAdjustmentVersions.hdVerMinor ) + .arg(vAdjustmentVersions.hdVerMicro ) + .arg(vAdjustmentVersions.hdVerBuild ) + .arg(vAdjustmentVersions.hdVerFPGAMajor ) + .arg(vAdjustmentVersions.hdVerFPGAMinor ) + .arg(vAdjustmentVersions.hdVerFPGALab ) + .arg(vAdjustmentVersions.hdVerFPGAId ) + .arg(vAdjustmentVersions.hdVerCompatibilityRev ) + ] + } + + DebugDataColumn { id: _DGVersionsColumn + textObjectName :"_DGVersionsData" + title : "" + horizontalAlignmentText: Text.AlignLeft + fontPixelSizeText: Fonts.fontPixelDebugTitle + model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" + .arg(vAdjustmentVersions.dgVerMajor ) + .arg(vAdjustmentVersions.dgVerMinor ) + .arg(vAdjustmentVersions.dgVerMicro ) + .arg(vAdjustmentVersions.dgVerBuild ) + .arg(vAdjustmentVersions.dgVerFPGAMajor ) + .arg(vAdjustmentVersions.dgVerFPGAMinor ) + .arg(vAdjustmentVersions.dgVerFPGALab ) + .arg(vAdjustmentVersions.dgVerFPGAId ) + .arg(vAdjustmentVersions.dgVerCompatibilityRev ) + ] + } + } } - DebugDataColumn { id: _HDVersionsColumn - x: col(6) - y: row(6) - title: "" - model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(vAdjustmentVersions.hdVerMajor) - .arg(vAdjustmentVersions.hdVerMinor) - .arg(vAdjustmentVersions.hdVerMicro) - .arg(vAdjustmentVersions.hdVerBuild) - .arg(vAdjustmentVersions.hdVerFPGAId) - .arg(vAdjustmentVersions.hdVerFPGAMajor) - .arg(vAdjustmentVersions.hdVerFPGAMinor) - .arg(vAdjustmentVersions.hdVerFPGALab) + DebugDataColumn { id: _PreTreatmentStatesColumn + textObjectName :"_PreTreatmentStatesData" + title : qsTr(" PreTx States ") + x: col(1.5) + y: row(5.5) + model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11" + .arg(vPreTreatmentStates.subMode ) + .arg(vPreTreatmentStates.waterSampleState ) + .arg(vPreTreatmentStates.selfTestConsumablesState) + .arg(vPreTreatmentStates.selfTestNoCartridgeState) + .arg(vPreTreatmentStates.installationState ) + .arg(vPreTreatmentStates.selfTestDryState ) + .arg(vPreTreatmentStates.primeState ) + .arg(vPreTreatmentStates.recirculateState ) + .arg(vPreTreatmentStates.patientConnectionState ) + .arg(vPreTreatmentStates.wetSelfTestsState ) + .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] - textObjectName: "_HDVersions" } - DebugDataColumn { id: _DGVersionsColumn - x: col(6) - y: row(6.5) - title: "" - model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(vAdjustmentVersions.dgVerMajor) - .arg(vAdjustmentVersions.dgVerMinor) - .arg(vAdjustmentVersions.dgVerMicro) - .arg(vAdjustmentVersions.dgVerBuild) - .arg(vAdjustmentVersions.dgVerFPGAId) - .arg(vAdjustmentVersions.dgVerFPGAMajor) - .arg(vAdjustmentVersions.dgVerFPGAMinor) - .arg(vAdjustmentVersions.dgVerFPGALab) - ] - textObjectName: "_DGVersions" - } - Text { id : _mouseEventCountText - x: col(2) - y: row(6) + text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) + x: col(0.3) + y: row(6.4) visible: true - text: String("Touch Count: %1,%2") - .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) - .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 38 + font.pixelSize: Fonts.fontPixelDebugText MouseArea { anchors.fill: _mouseEventCountText onClicked: GuiEventSpy.doTouchReset() } } - DebugDataColumn { id: _PreTreatmentStates - x: col(1) - y: row(6.5) - title: qsTr(" PreTx States ") - model: [ "%1, %2, %3, %4, %5, %6, %7, %8" - .arg(vPreTreatmentStates.subMode ) - .arg(vPreTreatmentStates.waterSampleState ) - .arg(vPreTreatmentStates.selfTestNoCartridgeState) - .arg(vPreTreatmentStates.installationState ) - .arg(vPreTreatmentStates.selfTestDryState ) - .arg(vPreTreatmentStates.primeState ) - .arg(vPreTreatmentStates.recirculateState ) - .arg(vPreTreatmentStates.patientConnectionState ) - ] - textObjectName: "_PreTreatmentStates" + Text { id : _canbusFaultCountText + property int count: 0 + text: qsTr("CANerr: %1").arg(count) + x: col(0.2) + y: row(6.8) + visible: true + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText } + Text { id : _hdResetInformation + x: col(1.5) + y: row(6.4) + visible: true + text: "HDrst:" + vGeneralEvent.hdReset + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText + } + + Text { id : _dgResetInformation + x: col(1.5) + y: row(6.8) + visible: true + text: "DGrst:" + vGeneralEvent.dgReset + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText + } + Connections { target: _GuiView - onDidActionReceive: { + function onDidActionReceive( vAction, vData ) { + // DEBUG: console.debug("onDidActionReceive", vAction, vData) if (vAction === GuiActions.ID_CANBusFaultCount ) { _canbusFaultCountText.count = vData[0] } } } } +