Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -re12bcd41f4bbc3f4a97f338ffb9d20c1a04f5f83 -rb50bbd0e8ab67f7752092a8a0460c5298ed02ef6 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision e12bcd41f4bbc3f4a97f338ffb9d20c1a04f5f83) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision b50bbd0e8ab67f7752092a8a0460c5298ed02ef6) @@ -49,6 +49,7 @@ height : width radius : width } + CloseButton { id : _closeButton anchors.left : undefined anchors.right : parent.right @@ -71,9 +72,10 @@ ] label: [ "MaxPrs", - "Flow", - "PWM", - "stt"] + "Flow" , + "PWM" , + "stt" , + ] } DebugDataColumn { id: _DGDrainPumpColumn @@ -85,13 +87,13 @@ vDGDrainPump.rpmi , vDGDrainPump.dac , vDGDrainPump.state , - vDGDrainPump.rpmo + vDGDrainPump.rpmo , ] label: [ "TgtSpd", - "DAC", - "stt", - "Spd", + "DAC" , + "stt" , + "Spd" , ] } @@ -104,7 +106,7 @@ vDGPressures.roInletPSI .toFixed(2) , vDGPressures.roOutletPSI .toFixed(2) , vDGPressures.drainInletPSI .toFixed(2) , - vDGPressures.drainOutletPSI .toFixed(2) + vDGPressures.drainOutletPSI .toFixed(2) , ] label: [ "PPi", @@ -144,11 +146,11 @@ label: [ "HP1", "HP2", - "HR", + "HR" , ] } - DebugDataColumn { id: _LoadCellReadingsColumn + DebugDataColumn { id: _DGLoadCellReadingsColumn textObjectName :"_DGLoadCellReadingsData" title : qsTr(" LoadCl ") x: col(5) @@ -157,7 +159,7 @@ vDGLoadCellReadings.reservoir1Prim .toFixed(2) , vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , vDGLoadCellReadings.reservoir2Prim .toFixed(2) , - vDGLoadCellReadings.reservoir2Bkup .toFixed(2) + vDGLoadCellReadings.reservoir2Bkup .toFixed(2) , ] label: [ "A1", @@ -184,19 +186,19 @@ vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , vDGTemperatures.primaryHeaterInternal .toFixed(2) , - vDGTemperatures.trimmerHeaterInternal .toFixed(2) + vDGTemperatures.trimmerHeaterInternal .toFixed(2) , ] label: [ - "TPi", - "TPo", - "TD1", - "TD2", - "TRo", - "TDi", + "TPi" , + "TPo" , + "TD1" , + "TD2" , + "TRo" , + "TDi" , "HP.Trm", "HR.Trm", - "HP.CJ", - "HR.CJ", + "HP.CJ" , + "HR.CJ" , "HP.Int", "HR.Int", ] @@ -229,14 +231,14 @@ x: col(6) y: row(4.1) model: [ - vHDAirBubble .venousAirBubbleStatus , - vHDAirTrap .airTrapLowerLevel , - vHDAirTrap .airTrapUpperLevel , + vHDAirBubble .venousAirBubbleStatus , + vHDAirTrap .airTrapLowerLevel , + vHDAirTrap .airTrapUpperLevel , ] label: [ - "ADV", - "ATll", - "ATul", + "ADV" , + "ATll" , + "ATul" , ] } @@ -245,7 +247,9 @@ title : qsTr(" DG Mode ") x: col(2.5) y: row(1.7) - model: [ vDGOperationMode.text ] + model: [ + vDGOperationMode.text , + ] fontPixelSizeText: 30 } @@ -263,22 +267,22 @@ vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) + vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) , ] label: [ - "Tgt.Flow", - "Msr.Flow", - "Rot.Spd", - "Mot.Spd", - "MC.Spd", - "MC.Cur", - "PWM", - "Rtr.Cnt", + "Tgt.Flow" , + "Msr.Flow" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , + "Rtr.Cnt" , ] } DebugDataColumn { id: _HDDialysateInletFlowColumn - textObjectName :"_HDInletFlowData" + textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) y: row(2.4) @@ -292,18 +296,18 @@ "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , ] label: [ - "Tgt.Flow", - "Msr.Flow", - "Rot.Spd", - "Mot.Spd", - "MC.Spd", - "MC.Cur", - "PWM", + "Tgt.Flow" , + "Msr.Flow" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , ] } DebugDataColumn { id: _HDDialysateOutletFlowColumn - textObjectName :"_HDOutletFlowData" + textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) y: row(2.4) @@ -314,28 +318,28 @@ 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) , ] label: [ - "UFRef", - "UFMeas", - "Rot.Spd", - "Mot.Spd", - "MC.Spd", - "MC.Cur", - "PWM", + "UFRef" , + "UFMeas" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , ] } DebugDataColumn { id: _HDPressureOcclusionColumn - textObjectName :"_PressureOcclusionData" + textObjectName :"_HDPressureOcclusionData" title : qsTr(" Prsr Oc ") x: col(3.7) y: row(1.7) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , - vTreatmentPressureOcclusion.bloodPumpOcclusion + vTreatmentPressureOcclusion.bloodPumpOcclusion , ] label: [ "PBA" , @@ -373,25 +377,27 @@ "Msr.Swt", "Msr.Frc", "safe.Vl", - "status", + "status" , ] - } DebugDataColumn { id: _HDOperationModeColumn textObjectName :"_HDOperationModeData" + title : qsTr(" HD Mode ") x: col(0.5) y: row(1.7) - title : qsTr(" HD Mode ") - model: [ vHDOperationMode.text ] + model: [ + vHDOperationMode.text , + ] fontPixelSizeText: 30 } DebugDataColumn { id: _DGValvesStatesColumn textObjectName :"_DGValvesStatesData" - title : qsTr(" DG Valves ") - x: col(7) - y: row(0) + 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: [ vDGValvesStates.valveStates_01, vDGValvesStates.valveStates_02, @@ -430,16 +436,16 @@ x: col(7) y: row(4.5) model: [ - vHDBloodLeak.bloodLeakDetectSetPoint , - vHDBloodLeak.bloodLeakZeroedStatus , - vHDBloodLeak.bloodLeakState , - vHDBloodLeak.bloodLeakDetectLevel , + vHDBloodLeak.bloodLeakDetectSetPoint , + vHDBloodLeak.bloodLeakZeroedStatus , + vHDBloodLeak.bloodLeakState , + vHDBloodLeak.bloodLeakDetectLevel , ] label: [ "SetPt" , - "0Stat" , - "State" , - "DtLvl" , + "0Stat" , + "State" , + "DtLvl" , ] } @@ -449,15 +455,19 @@ title : qsTr(" Alarms ") x: col(6) y: row(5.5) - model: [ _alarmItem.alarm_AlarmID ] - label: [ "Top" ] + model: [ + _alarmItem.alarm_AlarmID , + ] + label: [ + "Top" , + ] } - // TODO: Should be unnecessary since the first communication message with UI/HD is the version. + // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(4.2) + x : col(4.6) y : row(6.4) - width : 550 + width : 475 height : 80 onClicked : vAdjustmentVersions.doAdjustment() radius : 10 @@ -525,12 +535,11 @@ } Text { id : _mouseEventCountText + 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: %1,%2") - .arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) - .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) horizontalAlignment: Text.AlignLeft color: Colors.textMain font.pixelSize: 30 @@ -541,10 +550,10 @@ } Text { id : _canbusFaultCountText + property int count: 0 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 @@ -579,3 +588,4 @@ } } } +