Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r667baa15f6fc3a9438dae68ded8cee26c2ca7450 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 667baa15f6fc3a9438dae68ded8cee26c2ca7450) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -204,15 +204,15 @@ // Next row DebugDataColumn { id: _DGValvesStatesColumn - x: col(1) - y: row(2) + x: col(3.8) + y: row(5.2) title: qsTr(" Valves ") model: [ vDGValvesStates.text ] textObjectName: "_DGValvesStatesData" } DebugDataColumn { id: _DGOperationModeColumn - x: col(5) + x: col(2.5) y: row(2) title: qsTr(" DG Mode ") model: [ vDGOperationMode.text ] @@ -321,8 +321,42 @@ textObjectName: "_PressureOcclusionData" } + DebugDataColumn { id: _HDSyringePumpColumn + x: col(4.6) + y: row(2) + title: qsTr(" Syringe ") + model: [ + vHDSyringePump.syringePumpState , + vHDSyringePump.heparinState , + vHDSyringePump.setRate .toFixed(2) , + vHDSyringePump.measuredRate .toFixed(2) , + vHDSyringePump.syringePumpPosition , + vHDSyringePump.volumeDelivered .toFixed(2) , + vHDSyringePump.measuredHome .toFixed(2) , + vHDSyringePump.measuredSwitch .toFixed(2) , + vHDSyringePump.measuredForce .toFixed(2) , + vHDSyringePump.safetyVol .toFixed(2) , + vHDSyringePump.status , + ] + label: [ + "srng.St", + "hprn.St", + "setRate", + "msrRate", + "srngPos", + "VolumeD", + "Msr.Hom", + "Msr.Swt", + "Msr.Frc", + "safe.Vl", + "status", + ] + + textObjectName: "_HDSyringePumpColumn" + } + DebugDataColumn { id: _HDOperationModeColumn - x: col(2.8) + x: col(0.5) y: row(2) title: qsTr(" HD Mode ") model: [ vHDOperationMode.text ] @@ -398,11 +432,20 @@ textObjectName: "_DGAccelerometerData" } + TouchRect { + x : col(6) + y : row(5.8) + width : 150 + height : 35 + text.text : "Get Version" + onClicked : vAdjustmentVersions.doAdjustment() + } + DebugDataColumn { id: _HDVersionsColumn x: col(6) - y: row(4.5) - title: qsTr(" HD Ver ") - model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + y: row(6) + title: "" + model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8" .arg(vAdjustmentVersions.hdVerMajor) .arg(vAdjustmentVersions.hdVerMinor) .arg(vAdjustmentVersions.hdVerMicro) @@ -414,20 +457,11 @@ ] textObjectName: "_HDVersions" } - TouchRect { - x : col(5.2) - y : row(4.5) - width : 150 - height : 35 - text.text : "Get Version" - onClicked : vAdjustmentVersions.doAdjustment() - } - DebugDataColumn { id: _DGVersionsColumn x: col(6) - y: row(5.4) - title: qsTr(" DG Ver ") - model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" + y: row(6.5) + title: "" + model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8" .arg(vAdjustmentVersions.dgVerMajor) .arg(vAdjustmentVersions.dgVerMinor) .arg(vAdjustmentVersions.dgVerMicro)