Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r30a3a58cde0e82d66c8c5f242ec550007e20b694 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 30a3a58cde0e82d66c8c5f242ec550007e20b694) @@ -202,15 +202,47 @@ 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 + x: col(3.6) + y: row(3.4) + title: qsTr(" Conduct ") + model: [ + vDGConductivity.RORejectionRatio .toFixed(3), + vDGConductivity.CPi .toFixed(3), + vDGConductivity.CPo .toFixed(3), + vDGConductivity.CD1 .toFixed(3), + vDGConductivity.CD2 .toFixed(3), + ] + label: [ + "ROrr" , + "CPi" , + "CPo" , + "CD1" , + "CD2" , + ] + + textObjectName: "_DGConductivityData" } + DebugDataColumn { id: _HDAirColumn + x: col(6) + y: row(4.2) + title: qsTr(" Air Status ") + model: [ + vHDAirBubble .venousAirBubbleStatus , + vHDAirTrap .airTrapLowerLevel , + vHDAirTrap .airTrapUpperLevel , + + ] + label: [ + "ABs", + "ATll", + "ATul", + + ] + textObjectName: "_HDAirData" + } + DebugDataColumn { id: _DGOperationModeColumn x: col(2.5) y: row(2) @@ -299,7 +331,7 @@ DebugDataColumn { id: _HDPressureOcclusionColumn x: col(3.6) - y: row(2.8) + y: row(2) title: qsTr(" Prsr Oc ") model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , @@ -368,62 +400,63 @@ font.pixelSize: 38 } - DebugDataColumn { id: _HDAccelerometerColumn + DebugDataColumn { id: _DGValvesStatesColumn x: col(7) - y: row(3.2) - title: qsTr(" HD Acc ") + y: row(0) + title: qsTr(" DG Valves ") 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" + + textObjectName: "_DGValveData" } - DebugDataColumn { id: _DGAccelerometerColumn + DebugDataColumn { id: _HDBloodLeakColumn x: col(7) - y: row(0) - title: qsTr(" DG Acc ") + y: row(4.4) + title: qsTr(" BLD ") 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.bloodLeakCounter , ] label: [ - "x" , - "y" , - "z" , - "xMax" , - "yMax" , - "zMax" , - "x°" , - "y°" , - "z°" , + "SetPt" , + "0Stat" , + "State" , + "Cntr" , + ] - textObjectName: "_DGAccelerometerData" + + textObjectName: "_DGConductivityData" } TouchRect { @@ -502,6 +535,20 @@ textObjectName: "_PreTreatmentStates" } + DebugDataColumn { id: _HDAlarmTop + x: col(3) + y: row(6.5) + title: qsTr(" Alarm ") + model: [ + vAlarmStatus.alarm_AlarmID, + ] + label: [ + "Top" , + ] + + textObjectName: "_HDAlarmTopData" + } + Connections { target: _GuiView onDidActionReceive: { if (vAction === GuiActions.ID_CANBusFaultCount ) {