Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r4910e731017ba575e1f56c04dec0bf0589538f89 -r95c2b1e716dedddbde9aa2176e746ed485a36944 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 4910e731017ba575e1f56c04dec0bf0589538f89) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) @@ -235,21 +235,37 @@ vDGConductivity.CPo .toFixed(1), vDGConductivity.CD1 .toFixed(1), vDGConductivity.CD2 .toFixed(1), + vDGConductivity.CPiRaw .toFixed(1), + vDGConductivity.CPoRaw .toFixed(1), + vDGConductivity.CD1Raw .toFixed(1), + vDGConductivity.CD2Raw .toFixed(1), + vDGConductivity.CPiSensorStatus .toFixed(1), + vDGConductivity.CPoSensorStatus .toFixed(1), + vDGConductivity.CD1SensorStatus .toFixed(1), + vDGConductivity.CD2SensorStatus .toFixed(1), ] label: [ "ROrr" , "CPi" , "CPo" , "CD1" , "CD2" , + "CPir" , + "CPor" , + "CD1r" , + "CD2r" , + "CPis" , + "CPos" , + "CD1s" , + "CD2s" , ] } DebugDataColumn { id: _HDAirColumn textObjectName :"_HDAirData" - title : qsTr(" Air Status ") - x: col(3.7) - y: row(5.0) + title : qsTr("Air Status") + x: col(2.4) + y: row(5.5) model: [ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , @@ -278,7 +294,7 @@ textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.6) + y: row(2.5) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -305,7 +321,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.6) + y: row(2.5) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -330,7 +346,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.6) + y: row(2.5) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -486,9 +502,9 @@ // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(4.6) + x : col(5.0) y : row(6.4) - width : 475 + width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment() radius : 10