Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -rd18aafa7a51849a0ce6777806b6239988217b30a -r180629277c415aeea3818dd6630f2ad8b0a009ca --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision d18aafa7a51849a0ce6777806b6239988217b30a) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 180629277c415aeea3818dd6630f2ad8b0a009ca) @@ -318,7 +318,8 @@ Number(vDDValvesStates.dialyzerOutletValve ) , Number(vDDValvesStates.purgeValve2 ) , Number(vDDValvesStates.hydraulicsInletValve ) , - Number(vDDValvesStates.waterInletValve ) , + Number(vDDValvesStates.dryBicarbValve ) , + Number(vDDValvesStates.deScalerValve ) , ] label: [ "HydOut (D14) ", @@ -334,7 +335,8 @@ "DialOut (D40) ", "PurgV2 (D47) ", "HydIn (D3) ", - "WaterIn (M4) ", + "Dry Bicarb (D80) ", + "De-scaler (D81) ", ] } @@ -385,24 +387,89 @@ Number(vDDValvesStates.balancingChamberValve1 ) , Number(vDDValvesStates.balancingChamberValve2 ) , Number(vDDValvesStates.balancingChamberValve3 ) , - Number(vDDValvesStates.balancingChamberValve7 ) , + Number(vDDValvesStates.balancingChamberValve4 ) , Number(vDDValvesStates.balancingChamberValve5 ) , Number(vDDValvesStates.balancingChamberValve6 ) , - Number(vDDValvesStates.balancingChamberValve4 ) , + Number(vDDValvesStates.balancingChamberValve7 ) , Number(vDDValvesStates.balancingChamberValve8 ) , ] label: [ - "BC1 (D23) ", - "BC2 (D19) ", + "BC1 (D23) ", + "BC2 (D19) ", "BC3 (D25) ", - "BC7 (D26) ", + "BC4 (D21) ", "BC5 (D24) ", "BC6 (D20) ", - "BC4 (D21) ", + "BC7 (D26) ", "BC8 (D22) ", ] } + DebugDataColumn { id: _DDIOValvesColumn + textObjectName :"_DDIOValvesColumn" + title : qsTr(" IO Valves ") + x: col(9.5) + y: row(6) + model: [ + Number(vDDValvesStates.ioValve0 ) , + Number(vDDValvesStates.ioValve1 ) , + ] + label: [ + "IO0 (M4) ", + "IO1 (M12) ", + ] + } + + DebugDataColumn { id: _DDSpareValvesColumn + textObjectName :"_DDSpareValvesColumn" + title : qsTr(" Spare Valves ") + x: col(6) + y: row(5) + model: [ + Number(vDDValvesStates.spareValve0 ) , + Number(vDDValvesStates.spareValve1 ) , + Number(vDDValvesStates.spareValve2 ) , + Number(vDDValvesStates.spareValve3 ) , + Number(vDDValvesStates.spareValve4 ) , + Number(vDDValvesStates.spareValve5 ) , + Number(vDDValvesStates.spareValve6 ) , + Number(vDDValvesStates.spareValve7 ) , + ] + label: [ + "Spare Valve 0 (D79) ", + "Spare Valve 1 ", + "Spare Valve 2 ", + "Spare Valve 3 ", + "Spare Valve 4 ", + "Spare Valve 5 ", + "Spare Valve 6 ", + "Spare Valve 7 ", + ] + } + + DebugDataColumn { id: _DDFPValvesColumn + textObjectName :"_DDFPValvesColumn" + title : qsTr(" FP Valves ") + x: col(4.5) + y: row(5) + model: [ + Number(vDDValvesStates.fpValve0) , + Number(vDDValvesStates.fpValve1) , + Number(vDDValvesStates.fpValve2) , + Number(vDDValvesStates.fpValve3) , + Number(vDDValvesStates.fpValve4) , + Number(vDDValvesStates.fpValve5) , + ] + label: [ + "P11 ", + "P33 ", + "P34 ", + "P37 ", + "P39 ", + "P6 ", + ] + } + DebugDataColumn { id: _DDBloodLeakColumn textObjectName :"_DDBloodLeakData" title : qsTr(" Blood Leak ")