Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r26a05ea7e6dd3078331b2175927b00327c7419b4 -rb50bbd0e8ab67f7752092a8a0460c5298ed02ef6 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 26a05ea7e6dd3078331b2175927b00327c7419b4) +++ 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 @@ -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,55 @@ ] 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.rpmo , ] label: [ "TgtSpd", - "DAC", - "stt", - "Spd", + "DAC" , + "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) , vDGPressures.drainInletPSI .toFixed(2) , - vDGPressures.drainOutletPSI .toFixed(2) + vDGPressures.drainOutletPSI .toFixed(2) , ] label: [ "PPi", "PPo", "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 +131,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), @@ -143,34 +146,34 @@ 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.outletPrimaryHeater .toFixed(2) , @@ -183,29 +186,29 @@ 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", ] - textObjectName: "_DGTemperaturesData" } DebugDataColumn { id: _DGConductivityColumn - x: col(3.8) - y: row(3.5) - title: qsTr(" Conduct ") + textObjectName :"_DGConductivityData" + title : qsTr(" Conduct ") + x: col(3.7) + y: row(3.0) model: [ vDGConductivity.RORejectionRatio .toFixed(3), vDGConductivity.CPi .toFixed(1), @@ -220,40 +223,42 @@ "CD1" , "CD2" , ] - - textObjectName: "_DGConductivityData" } DebugDataColumn { id: _HDAirColumn + textObjectName :"_HDAirData" + title : qsTr(" Air Status ") x: col(6) y: row(4.1) - title: qsTr(" Air Status ") model: [ - vHDAirBubble .venousAirBubbleStatus , - vHDAirTrap .airTrapLowerLevel , - vHDAirTrap .airTrapUpperLevel , + vHDAirBubble .venousAirBubbleStatus , + vHDAirTrap .airTrapLowerLevel , + vHDAirTrap .airTrapUpperLevel , ] label: [ - "ADV", - "ATll", - "ATul", + "ADV" , + "ATll" , + "ATul" , ] - textObjectName: "_HDAirData" } 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.7) + model: [ + vDGOperationMode.text , + ] + 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) , @@ -262,25 +267,25 @@ 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" , ] - textObjectName: "_HDBloodFlowData" } DebugDataColumn { id: _HDDialysateInletFlowColumn + textObjectName :"_HDDialysateInletFlowData" + 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) , @@ -291,64 +296,63 @@ "%" + 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" , ] - 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.4) 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) , ] label: [ - "UFRef", - "UFMeas", - "Rot.Spd", - "Mot.Spd", - "MC.Spd", - "MC.Cur", - "PWM", + "UFRef" , + "UFMeas" , + "Rot.Spd" , + "Mot.Spd" , + "MC.Spd" , + "MC.Cur" , + "PWM" , ] - textObjectName: "_HDOutletFlowData" } DebugDataColumn { id: _HDPressureOcclusionColumn + textObjectName :"_HDPressureOcclusionData" + title : qsTr(" Prsr Oc ") x: col(3.7) - y: row(2) - title: qsTr(" Prsr Oc ") + y: row(1.7) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , - vTreatmentPressureOcclusion.bloodPumpOcclusion + vTreatmentPressureOcclusion.bloodPumpOcclusion , ] label: [ "PBA" , "PBo" , "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 , @@ -373,35 +377,27 @@ "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.7) + model: [ + vHDOperationMode.text , + ] + fontPixelSizeText: 30 } - Text { id : _canbusFaultCountText - x: col(0) - y: row(6.8) - 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 - x: col(7) - y: row(0) - title: qsTr(" DG Valves ") + 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: [ vDGValvesStates.valveStates_01, vDGValvesStates.valveStates_02, @@ -432,123 +428,156 @@ "VR2", "VRD", ] - - textObjectName: "_DGValveData" } DebugDataColumn { id: _HDBloodLeakColumn + textObjectName :"_HDBloodLeakData" + title : qsTr(" BLD ") x: col(7) - y: row(4.4) - title: qsTr(" BLD ") + 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" , ] + } - textObjectName: "_DGConductivityData" + DebugDataColumn { id: _HDAlarmTopColumn + textObjectName :"_HDAlarmTopData" + title : qsTr(" Alarms ") + x: col(6) + y: row(5.5) + model: [ + _alarmItem.alarm_AlarmID , + ] + label: [ + "Top" , + ] } + // TODO: The TouchRect 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" + x : col(4.6) + y : row(6.4) + width : 475 + 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: 30 + 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: 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.dgVerFPGAMajor ) + .arg(vAdjustmentVersions.dgVerFPGAMinor ) + .arg(vAdjustmentVersions.dgVerFPGALab ) + .arg(vAdjustmentVersions.dgVerFPGAId ) + .arg(vAdjustmentVersions.dgVerCompatibilityRev ) + ] + } + } } - DebugDataColumn { id: _HDVersionsColumn - x: col(6.8) - y: row(6) - fontPixelSizeText: 30 - title: "" - model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8 CRev: %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.hdVerCompatibilityRev) + DebugDataColumn { id: _PreTreatmentStatesColumn + textObjectName :"_PreTreatmentStatesData" + title : qsTr(" PreTx States ") + x: col(1.0) + y: row(5.5) + model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9" + .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 ) ] - textObjectName: "_HDVersions" } - DebugDataColumn { id: _DGVersionsColumn - x: col(6.8) - y: row(6.5) - fontPixelSizeText: 30 - title: "" - model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8 CRev: %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.dgVerCompatibilityRev) - ] - textObjectName: "_DGVersions" - } - Text { id : _mouseEventCountText - x: col(2) - y: row(6.8) + 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: 30 MouseArea { anchors.fill: _mouseEventCountText onClicked: GuiEventSpy.doTouchReset() } } - DebugDataColumn { id: _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: 30 + } + + Text { id : _hdResetInformation x: col(1.5) - y: row(6) - 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" + y: row(6.4) + visible: true + text: "HDrst:" + vGeneralEvent.hdReset + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: 30 } - DebugDataColumn { id: _HDAlarmTop - x: col(3) - y: row(6) - title: qsTr(" Alarms ") - model: [ - _alarmItem.alarm_AlarmID, - ] - label: [ - "Top" , - ] - - textObjectName: "_HDAlarmTopData" + 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: 30 } Connections { target: _GuiView @@ -559,3 +588,4 @@ } } } +