Fix LogView consistency and LtsUtilsGuiDds link after the merge
- LogView: take the complete XmlPatterns (d327c66c4) file set - the
auto-merged mix (XmlPatterns .cpp + validation .hpp) left duplicated
m_logger members and constructor signature mismatches, because the
two lineages reworked the module differently.
- LogView CMakeLists: the cleanup version (separate LogViewLogger
static library, required by tabPluginTetraJson and present in the
Release 2 target list).
- LtsUtilsGuiDds: link ddscore (BUILD_RTI) for the Core::FunctionReply
symbols, as in story/release-2-cleanup.
Full-scope ninja all is green; ctest 20/22 (the two failures,
GrantleeParserSmoke and utils_test, are out of the driver's 46-target
scope and 'Not Run' in the official baseline).
This commit is contained in:
1 parent
edd5e3ba81
commit
473462cbdb
42 files changed
+2779
-3251
No files matched your search
@@ -1,16 +1,16 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QStringList>
|
||||
@@ -34,7 +34,7 @@ namespace N_LogView
|
||||
};
|
||||
|
||||
|
||||
LogViewField(const QString &a_name, const E_FieldKind a_kind, const LogViewXdrElement *a_xdrElement);
|
||||
LogViewField(const QString& a_name, const E_FieldKind a_kind, const LogViewXdrElement* a_xdrElement);
|
||||
virtual ~LogViewField();
|
||||
|
||||
LogViewField *clone(int arrayIdx) const;
|
||||
@@ -44,7 +44,7 @@ namespace N_LogView
|
||||
void setName(const QString &newVal) { m_Name = newVal; }
|
||||
|
||||
|
||||
void addChild(LogViewField *a_child);
|
||||
void addChild(LogViewField* a_child);
|
||||
void removeLastChild();
|
||||
LogViewField *child(int arrayIdx);
|
||||
int childCount() const { return m_Child.size(); }
|
||||
@@ -57,15 +57,8 @@ namespace N_LogView
|
||||
void addValue(const QString &value);
|
||||
void addValueBinaryHex(const QString &value);
|
||||
|
||||
/**
|
||||
* Returns the value at position a_index converted to a string. If the field is a
|
||||
* date-time-field, the returned value is converted to a string containing date
|
||||
* and time, execpt when a_doNotMakeSpecialConversions is set to true, the unix-
|
||||
* time will be returned as value.
|
||||
*
|
||||
* @param a_index
|
||||
* @param a_doNotMakeSpecialConversions
|
||||
*/
|
||||
|
||||
|
||||
QString value(int arrayIdx, const bool a_doNotMakeSpecialConversions = false) const;
|
||||
int valueListSize() const { return m_ValueList.size(); }
|
||||
|
||||
@@ -81,21 +74,12 @@ namespace N_LogView
|
||||
int64_t getHighestValue() const;
|
||||
int64_t getLowestValue() const;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param a_indent
|
||||
*/
|
||||
|
||||
|
||||
void dump(const QString &a_indent = QString()) const;
|
||||
|
||||
/**
|
||||
* Makes the text <a_uncleanText> pretty for human readable. It does following:
|
||||
* - generates umlaute (ä, ö, ü)
|
||||
* - removes _rt at end
|
||||
* - replaces _ with space
|
||||
* - uppercase of every word
|
||||
*
|
||||
* @param a_uncleanText
|
||||
*/
|
||||
|
||||
|
||||
static QString makeClean(const QString &text);
|
||||
|
||||
|
||||
@@ -103,11 +87,10 @@ namespace N_LogView
|
||||
void setSize(int newVal) { m_Size = newVal; }
|
||||
|
||||
|
||||
const LogViewXdrElement *xdrElement() const { return m_XdrElement; }
|
||||
const LogViewXdrElement* xdrElement() const { return m_XdrElement; }
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* returns true if the field is a date-time
|
||||
*/
|
||||
bool isDateTimeField() const;
|
||||
bool isMSecsField() const;
|
||||
|
||||
@@ -115,9 +98,8 @@ namespace N_LogView
|
||||
uint16_t maxArraySize() const { return m_MaxArraySize; }
|
||||
void setMaxArraySize(uint16_t newVal, const bool a_isDynamic);
|
||||
|
||||
/**
|
||||
* True if the array is dynamic.
|
||||
*/
|
||||
|
||||
|
||||
bool isDynamicArray() const { return m_IsDynamicArray; }
|
||||
|
||||
|
||||
@@ -130,7 +112,6 @@ namespace N_LogView
|
||||
QStringList jsonPath() const { return m_jsonPath; }
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
QString m_Name;
|
||||
QString m_type;
|
||||
@@ -141,13 +122,12 @@ namespace N_LogView
|
||||
uint16_t m_Offset;
|
||||
int m_Size;
|
||||
uint16_t m_MaxArraySize;
|
||||
/**
|
||||
* True if the array is dynamic.
|
||||
*/
|
||||
|
||||
|
||||
bool m_IsDynamicArray;
|
||||
bool m_HasContent;
|
||||
bool m_bDeleteXdr;
|
||||
QVector<LogViewField *> m_Child;
|
||||
QVector<LogViewField*> m_Child;
|
||||
|
||||
E_FieldKind m_Kind;
|
||||
|
||||
|
||||
Reference in new issue
Block a user