Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r91c381afa3a5a01579d47a603600f1a56c8ab5b6 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 91c381afa3a5a01579d47a603600f1a56c8ab5b6) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -281,36 +281,44 @@ ] } - DebugDataColumn { id: _DDGenDialColumn - textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") + + DebugDataColumn { id: _DDOpModeColumn + textObjectName :"_DDOpModeColumn" + title : qsTr(" OpMode ") anchors { top : parent.top left : _DDPressureColumn.right leftMargin : spacing } + model: [ + vDDOperationMode.opMode , + vDDOperationMode.subMode , + ] + label: [ + "opMode " , + "subMode " + ] + } + DebugDataColumn { id: _DDGenDialColumn + textObjectName :"_DDGenDialData" + title : qsTr(" GenDial ") + anchors { + top : _DDOpModeColumn.bottom + topMargin : spacing + left : _DDOpModeColumn.left + } model: [ vDDGenDialysate.genDialysateExec , vDDGenDialysate.ddInProgress , vDDGenDialysate.isDialGood , - vDDGenDialysate.fltLevel1 , - vDDGenDialysate.bicarbLevel , - vDDGenDialysate.spentLevel , - vDDGenDialysate.hydNegativePressure .toFixed(2), - vDDGenDialysate.hydPositivePressure .toFixed(2), - vDDGenDialysate.spentPressure .toFixed(2), + vDDGenDialysate.currentQd .toFixed(2) , ] label: [ "Exec ", "inProg ", "isGood ", - "fltLvL (D6) ", - "bicarbLvL (D63)", - "sptLvL (D46) ", - "hydNeg (D19) ", - "hydPos (D18) ", - "sptPres (D51) ", + "current Qd ", ] }