Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r5349652d6b046b37f9ac0fc6577953413815deeb -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 5349652d6b046b37f9ac0fc6577953413815deeb) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -292,7 +292,7 @@ model: [ vDGOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } // --- HD --- @@ -437,7 +437,7 @@ model: [ vHDOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } DebugDataColumn { id: _DGValvesStatesColumn @@ -447,24 +447,24 @@ y: row(0.0) width: 50 model: [ - vDGValvesStates.valveStates_VRF , - vDGValvesStates.valveStates_VRI , - vDGValvesStates.valveStates_VRD , - vDGValvesStates.valveStates_VRO , - vDGValvesStates.valveStates_VPO , - vDGValvesStates.valveStates_VBF , - vDGValvesStates.valveStates_VRC , - vDGValvesStates.valveStates_VDR , - vDGValvesStates.valveStates_VPI , - vDGValvesStates.valveStates_VSP , - vDGValvesStates.valveStates_VR1 , - vDGValvesStates.valveStates_VR2 , - vDGValvesStates.valveStates_VPD , + "%1,%2".arg(vDGValvesStates.valveStatus_VRF).arg(vDGValvesStates.valveStates_VRF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRI).arg(vDGValvesStates.valveStates_VRI), + "%1,%2".arg(vDGValvesStates.valveStatus_RES).arg(vDGValvesStates.valveStates_RES), + "%1,%2".arg(vDGValvesStates.valveStatus_VRO).arg(vDGValvesStates.valveStates_VRO), + "%1,%2".arg(vDGValvesStates.valveStatus_VPO).arg(vDGValvesStates.valveStates_VPO), + "%1,%2".arg(vDGValvesStates.valveStatus_VBF).arg(vDGValvesStates.valveStates_VBF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRC).arg(vDGValvesStates.valveStates_VRC), + "%1,%2".arg(vDGValvesStates.valveStatus_VDR).arg(vDGValvesStates.valveStates_VDR), + "%1,%2".arg(vDGValvesStates.valveStatus_VPI).arg(vDGValvesStates.valveStates_VPI), + "%1,%2".arg(vDGValvesStates.valveStatus_VSP).arg(vDGValvesStates.valveStates_VSP), + "%1,%2".arg(vDGValvesStates.valveStatus_VR1).arg(vDGValvesStates.valveStates_VR1), + "%1,%2".arg(vDGValvesStates.valveStatus_VR2).arg(vDGValvesStates.valveStates_VR2), + "%1,%2".arg(vDGValvesStates.valveStatus_VPD).arg(vDGValvesStates.valveStates_VPD), ] label: [ "VRF", "VRI", - "VRD", + "RES", "VRO", "VPO", "VBF", @@ -525,7 +525,7 @@ textObjectName :"_HDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.hdVerMajor ) .arg(vAdjustmentVersions.hdVerMinor ) @@ -543,7 +543,7 @@ textObjectName :"_DGVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.dgVerMajor ) .arg(vAdjustmentVersions.dgVerMinor ) @@ -577,7 +577,6 @@ .arg(vPreTreatmentStates.wetSelfTestsState ) .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] - fontPixelSizeText: 30 } Text { id : _mouseEventCountText @@ -588,7 +587,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText MouseArea { anchors.fill: _mouseEventCountText onClicked: GuiEventSpy.doTouchReset() @@ -603,7 +602,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _hdResetInformation @@ -613,7 +612,7 @@ text: "HDrst:" + vGeneralEvent.hdReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _dgResetInformation @@ -623,7 +622,7 @@ text: "DGrst:" + vGeneralEvent.dgReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Connections { target: _GuiView