Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rfe301ed4aa3b3e5cd2a279488652338ee66366a1 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fe301ed4aa3b3e5cd2a279488652338ee66366a1) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -107,12 +107,14 @@ vDGPressures.roOutletPSI .toFixed(2) , vDGPressures.drainInletPSI .toFixed(2) , vDGPressures.drainOutletPSI .toFixed(2) , + vDGPressures.barometricPSI .toFixed(2) , ] label: [ "PPi", "PPo", "PRd", "PDr", + "bar", ] } @@ -210,7 +212,7 @@ textObjectName :"_DGConductivityData" title : qsTr(" Conduct ") x: col(3.7) - y: row(3.0) + y: row(3.2) model: [ vDGConductivity.RORejectionRatio .toFixed(3), vDGConductivity.CPi .toFixed(1), @@ -248,7 +250,7 @@ textObjectName :"_DGOperationModeData" title : qsTr(" DG Mode ") x: col(2.5) - y: row(1.7) + y: row(1.9) model: [ vDGOperationMode.text , ] @@ -260,7 +262,7 @@ textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.4) + y: row(2.6) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -287,7 +289,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.4) + y: row(2.6) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -312,7 +314,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.4) + y: row(2.6) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -337,7 +339,7 @@ textObjectName :"_HDPressureOcclusionData" title : qsTr(" Prsr Oc ") x: col(3.7) - y: row(1.7) + y: row(1.9) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , @@ -354,7 +356,7 @@ textObjectName :"_HDSyringePumpData" title : qsTr(" Syringe ") x: col(4.6) - y: row(1.7) + y: row(1.9) model: [ vHDSyringePump.syringePumpState , vHDSyringePump.heparinState , @@ -387,7 +389,7 @@ textObjectName :"_HDOperationModeData" title : qsTr(" HD Mode ") x: col(0.5) - y: row(1.7) + y: row(1.9) model: [ vHDOperationMode.text , ] @@ -521,9 +523,9 @@ DebugDataColumn { id: _PreTreatmentStatesColumn textObjectName :"_PreTreatmentStatesData" title : qsTr(" PreTx States ") - x: col(1.0) + x: col(1.5) y: row(5.5) - model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9" + model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11" .arg(vPreTreatmentStates.subMode ) .arg(vPreTreatmentStates.waterSampleState ) .arg(vPreTreatmentStates.selfTestConsumablesState) @@ -533,7 +535,10 @@ .arg(vPreTreatmentStates.primeState ) .arg(vPreTreatmentStates.recirculateState ) .arg(vPreTreatmentStates.patientConnectionState ) + .arg(vPreTreatmentStates.wetSelfTestsState ) + .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] + fontPixelSizeText: 30 } Text { id : _mouseEventCountText