Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r1471b17705cd8c0e4e3443c6bba85f742af88d6e -r89e90419935eca40c818f23daa7bf75a4bb150aa --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 1471b17705cd8c0e4e3443c6bba85f742af88d6e) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 89e90419935eca40c818f23daa7bf75a4bb150aa) @@ -158,6 +158,32 @@ ] } + Text { id : _mouseEventCountText + text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) + x: col(3.5) + y: row(1.5) + visible: true + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText + MouseArea { + anchors.fill: _mouseEventCountText + onClicked: GuiEventSpy.doTouchReset() + } + } + + Text { id : _canbusFaultCountText + property int count: 0 + text: qsTr("CANerr: %1").arg(count) + x: col(5.0) + y: row(1.5) + visible: true + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText + } + DebugDataColumn { id: _DGLoadCellReadingsColumn textObjectName :"_DGLoadCellReadingsData" title : qsTr(" LoadCl ") @@ -585,34 +611,8 @@ ] } - Text { id : _mouseEventCountText - text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) - .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) - x: col(0.3) - y: row(6.4) - visible: true - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelDebugText - MouseArea { - anchors.fill: _mouseEventCountText - onClicked: GuiEventSpy.doTouchReset() - } - } - - Text { id : _canbusFaultCountText - property int count: 0 - text: qsTr("CANerr: %1").arg(count) - x: col(0.2) - y: row(6.8) - visible: true - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelDebugText - } - Text { id : _hdResetInformation - x: col(1.5) + x: col(0.2) y: row(6.4) visible: true text: "HDrst:" + vGeneralEvent.hdReset @@ -622,7 +622,7 @@ } Text { id : _dgResetInformation - x: col(1.5) + x: col(0.2) y: row(6.8) visible: true text: "DGrst:" + vGeneralEvent.dgReset Index: sources/view/VGeneralEvent.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r89e90419935eca40c818f23daa7bf75a4bb150aa --- sources/view/VGeneralEvent.cpp (.../VGeneralEvent.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/VGeneralEvent.cpp (.../VGeneralEvent.cpp) (revision 89e90419935eca40c818f23daa7bf75a4bb150aa) @@ -63,11 +63,12 @@ GET_VALUE(hdValue) - if( vData.mEventID == eReset ) + if( vData.mEventID == eReset ) { hdReset(QString("%1,%2") - .arg(dateTime.toString(_resetFormat)) - .arg(_hdValue.toString()) - ); + .arg(dateTime.toString(_resetFormat)) + .arg(Format::toHexString(_hdValue.toUInt(), true, 4)) + ); + } } /*! @@ -96,6 +97,6 @@ if( vData.mEventID == eReset ) dgReset(QString("%1,%2") .arg(dateTime.toString(_resetFormat)) - .arg(_dgValue.toString()) + .arg(Format::toHexString(_dgValue.toUInt(), true, 4)) ); } Index: sources/view/VGeneralEvent.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r89e90419935eca40c818f23daa7bf75a4bb150aa --- sources/view/VGeneralEvent.h (.../VGeneralEvent.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/VGeneralEvent.h (.../VGeneralEvent.h) (revision 89e90419935eca40c818f23daa7bf75a4bb150aa) @@ -37,7 +37,7 @@ { Q_OBJECT - const char *_resetFormat = "MMddyy,HHmmss"; + const char *_resetFormat = "MM/dd/yy,HH:mm:ss"; enum { zero = 0 }; enum Even_ID_Enum {