Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r94ac4d29c2c82ea416d7073f378f6c858f557d69 -rfe7605e216422cd8a9e39eca7cc609730a56fa32 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 94ac4d29c2c82ea416d7073f378f6c858f557d69) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fe7605e216422cd8a9e39eca7cc609730a56fa32) @@ -7,7 +7,7 @@ * * \file DiagnosticsDialog.qml * \author (last) Behrouz NematiPour - * \date (last) 30-Jul-2021 + * \date (last) 17-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 11-May-2021 * @@ -59,9 +59,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) , @@ -73,13 +74,13 @@ "Flow", "PWM", "stt"] - textObjectName: "_DGROPumpData" } DebugDataColumn { id: _DGDrainPumpColumn + textObjectName :"_DGDrainPumpData" + title : qsTr(" DRP ") x: col(1) y: row(0) - title: qsTr(" DRP ") model: [ vDGDrainPump.rpmi , vDGDrainPump.dac , @@ -92,13 +93,13 @@ "stt", "Spd", ] - 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) , @@ -111,13 +112,13 @@ "PRd", "PDr", ] - 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,13 +129,13 @@ "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), @@ -145,13 +146,13 @@ "HP2", "HR", ] - textObjectName: "_DGHeatersData" } DebugDataColumn { id: _LoadCellReadingsColumn + textObjectName :"_DGLoadCellReadingsData" + title : qsTr(" LoadCl ") x: col(5) y: row(0) - title: qsTr(" LoadCl ") model: [ vDGLoadCellReadings.reservoir1Prim .toFixed(2) , vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , @@ -164,13 +165,13 @@ "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.outletPrimaryHeater .toFixed(2) , @@ -199,31 +200,61 @@ "HP.Int", "HR.Int", ] - 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.0) + model: [ + vDGConductivity.RORejectionRatio .toFixed(3), + vDGConductivity.CPi .toFixed(1), + vDGConductivity.CPo .toFixed(1), + vDGConductivity.CD1 .toFixed(1), + vDGConductivity.CD2 .toFixed(1), + ] + label: [ + "ROrr" , + "CPi" , + "CPo" , + "CD1" , + "CD2" , + ] } + DebugDataColumn { id: _HDAirColumn + textObjectName :"_HDAirData" + title : qsTr(" Air Status ") + x: col(6) + y: row(4.1) + 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 ") + y: row(1.7) model: [ vDGOperationMode.text ] - textObjectName: "_DGOperationModeData" + fontPixelSizeText: 30 } // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn + textObjectName :"_HDBloodFlowData" + title : qsTr(" BP ") x: col(0) - y: row(2.8) - title: qsTr(" BP ") + y: row(2.4) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -244,13 +275,13 @@ "PWM", "Rtr.Cnt", ] - textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn + textObjectName :"_HDInletFlowData" + title : qsTr(" DPi ") x: col(1.2) - y: row(2.8) - title: qsTr(" DPi ") + y: row(2.4) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -269,13 +300,13 @@ "MC.Cur", "PWM", ] - textObjectName: "_HDInletFlowData" } DebugDataColumn { id: _HDDialysateOutletFlowColumn + textObjectName :"_HDOutletFlowData" + title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.8) - title: qsTr(" UF/DPo ") + y: row(2.4) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -294,35 +325,30 @@ "MC.Cur", "PWM", ] - textObjectName: "_HDOutletFlowData" } DebugDataColumn { id: _HDPressureOcclusionColumn - x: col(3.6) - y: row(2.8) - title: qsTr(" Prsr Oc ") + textObjectName :"_PressureOcclusionData" + title : qsTr(" Prsr Oc ") + x: col(3.7) + y: row(1.7) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , - vTreatmentPressureOcclusion.bloodPumpOcclusion , - vTreatmentPressureOcclusion.dialysateInletPumpOcclusion , - vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion + vTreatmentPressureOcclusion.bloodPumpOcclusion ] 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.7) model: [ vHDSyringePump.syringePumpState , vHDSyringePump.heparinState , @@ -350,162 +376,195 @@ "status", ] - textObjectName: "_HDSyringePumpColumn" } DebugDataColumn { id: _HDOperationModeColumn + textObjectName :"_HDOperationModeData" x: col(0.5) - y: row(2) - title: qsTr(" HD Mode ") + y: row(1.7) + title : qsTr(" HD Mode ") model: [ vHDOperationMode.text ] - textObjectName: "_HDOperationModeData" + fontPixelSizeText: 30 } - 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: _HDAccelerometerColumn + DebugDataColumn { id: _DGValvesStatesColumn + textObjectName :"_DGValvesStatesData" + title : qsTr(" DG Valves ") x: col(7) - y: row(3.2) - title: qsTr(" HD Acc ") + y: row(0) 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) + vDGValvesStates.valveStates_01, + vDGValvesStates.valveStates_02, + vDGValvesStates.valveStates_03, + vDGValvesStates.valveStates_04, + vDGValvesStates.valveStates_05, + vDGValvesStates.valveStates_06, + vDGValvesStates.valveStates_07, + vDGValvesStates.valveStates_08, + vDGValvesStates.valveStates_09, + vDGValvesStates.valveStates_10, + vDGValvesStates.valveStates_11, + vDGValvesStates.valveStates_12, + vDGValvesStates.valveStates_13, ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "VRF", + "VRI", + "VRD", + "VRO", + "VPO", + "VBF", + "VRC", + "VDR", + "VPI", + "VSP", + "VR1", + "VR2", + "VRD", ] - textObjectName: "_HDAccelerometerData" } - DebugDataColumn { id: _DGAccelerometerColumn + DebugDataColumn { id: _HDBloodLeakColumn + textObjectName :"_HDBloodLeakData" + title : qsTr(" BLD ") x: col(7) - y: row(0) - title: qsTr(" DG Acc ") + y: row(4.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) + vHDBloodLeak.bloodLeakDetectSetPoint , + vHDBloodLeak.bloodLeakZeroedStatus , + vHDBloodLeak.bloodLeakState , + vHDBloodLeak.bloodLeakDetectLevel , ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "SetPt" , + "0Stat" , + "State" , + "DtLvl" , + ] - textObjectName: "_DGAccelerometerData" } - TouchRect { - x : col(6) - y : row(5.8) - width : 150 - height : 35 - text.text : "Get Version" - onClicked : vAdjustmentVersions.doAdjustment() + // TODO: Should be unnecessary since the first communication message with UI/HD is the version. + // TouchRect { + // x : col(6.6) + // y : row(5.8) + // width : 150 + // height : 35 + // text.text : "Get Version" + // onClicked : vAdjustmentVersions.doAdjustment() + // } + + DebugDataColumn { id: _HDAlarmTopColumn + textObjectName :"_HDAlarmTopData" + title : qsTr(" Alarms ") + x: col(6) + y: row(5.5) + model: [ _alarmItem.alarm_AlarmID ] + label: [ "Top" ] } DebugDataColumn { id: _HDVersionsColumn - x: col(6) + textObjectName :"_HDVersionsData" + title : "" + x: col(6.8) y: row(6) - title: "" - model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8" + fontPixelSizeText: 30 + model: [ "DG: 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.hdVerFPGAId) .arg(vAdjustmentVersions.hdVerFPGAMajor) .arg(vAdjustmentVersions.hdVerFPGAMinor) .arg(vAdjustmentVersions.hdVerFPGALab) + .arg(vAdjustmentVersions.hdVerFPGAId) + .arg(vAdjustmentVersions.hdVerCompatibilityRev) ] - textObjectName: "_HDVersions" } + DebugDataColumn { id: _DGVersionsColumn - x: col(6) + textObjectName :"_DGVersionsData" + title : "" + x: col(6.8) y: row(6.5) - title: "" - model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8" + fontPixelSizeText: 30 + 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.dgVerFPGAId) .arg(vAdjustmentVersions.dgVerFPGAMajor) .arg(vAdjustmentVersions.dgVerFPGAMinor) .arg(vAdjustmentVersions.dgVerFPGALab) + .arg(vAdjustmentVersions.dgVerFPGAId) + .arg(vAdjustmentVersions.dgVerCompatibilityRev) ] - textObjectName: "_DGVersions" } + DebugDataColumn { id: _PreTreatmentStatesColumn + textObjectName :"_PreTreatmentStatesData" + title : qsTr(" PreTx States ") + x: col(0.7) + y: row(5.5) + 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 ) + ] + } Text { id : _mouseEventCountText - x: col(2) - y: row(6) + x: col(0.3) + y: row(6.4) visible: true - text: String("Touch Count: %1,%2") + text: String("Touch: %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: 30 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 + text: qsTr("CANerr: %1").arg(count) + x: col(0.2) + y: row(6.8) + property int count: 0 + visible: true + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: 30 } + Text { id : _hdResetInformation + x: col(2.0) + y: row(6.4) + visible: true + text: "HDrst:" + vGeneralEvent.hdReset + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: 30 + } + + Text { id : _dgResetInformation + x: col(2.0) + y: row(6.8) + visible: true + text: "DGrst:" + vGeneralEvent.dgReset + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: 30 + } + Connections { target: _GuiView onDidActionReceive: { if (vAction === GuiActions.ID_CANBusFaultCount ) {