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,23 +1,23 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include "LogViewXdrElement.hpp"
|
||||
#include <vector>
|
||||
|
||||
// forward declarations from stereotyped includes
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
class LogViewXdrValue;
|
||||
@@ -29,42 +29,32 @@ namespace N_LogView
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
/**
|
||||
* This class represents elements which have childs.
|
||||
* This are enum and struct.
|
||||
* @author alois.wismer
|
||||
* @version 1.0
|
||||
* @created 31-Mrz-2010 11:59:19
|
||||
*/
|
||||
|
||||
|
||||
class LogViewXdrStruct final : public LogViewXdrElement
|
||||
{
|
||||
public:
|
||||
LogViewXdrStruct(const QString &a_name, const LogViewXdrElement::E_ElementKind a_kind, uint16_t enumSize = 0);
|
||||
LogViewXdrStruct(const QString& a_name, const LogViewXdrElement::E_ElementKind a_kind, uint16_t enumSize = 0);
|
||||
~LogViewXdrStruct();
|
||||
|
||||
void addElement(const QString &a_name,
|
||||
const QString &a_type,
|
||||
const uint16_t a_arraySize,
|
||||
const uint16_t a_dynArrayOffset,
|
||||
const E_ElementKind a_kind,
|
||||
const int16_t a_firstBit = -1,
|
||||
const int16_t a_lastBit = -1,
|
||||
const bool a_isLast = true);
|
||||
void addElement(const QString &a_name, const uint32_t a_value, const E_ElementKind a_kind);
|
||||
void addElement(const QString& a_name, const QString& a_type, const uint16_t a_arraySize, const uint16_t a_dynArrayOffset, const E_ElementKind a_kind, const int16_t a_firstBit = -1, const int16_t a_lastBit = -1, const bool a_isLast = true);
|
||||
void addElement(const QString& a_name, const uint32_t a_value, const E_ElementKind a_kind);
|
||||
|
||||
LogViewXdrElement *getChild(const uint32_t a_childIndex) const;
|
||||
LogViewXdrType *getChildAsType(const uint32_t a_childIndex) const;
|
||||
LogViewXdrValue *getChildAsValue(const uint32_t a_childIndex) const;
|
||||
LogViewXdrElement* getChild(const uint32_t a_childIndex) const;
|
||||
LogViewXdrType* getChildAsType(const uint32_t a_childIndex) const;
|
||||
LogViewXdrValue* getChildAsValue(const uint32_t a_childIndex) const;
|
||||
|
||||
|
||||
void dump() const override;
|
||||
|
||||
uint32_t getChildValue(const QString &a_name, bool *a_error = nullptr) const;
|
||||
uint32_t getChildValue(const QString& a_name, bool* a_error = nullptr) const;
|
||||
uint16_t getEnumSize() const { return m_EnumSize; }
|
||||
|
||||
protected:
|
||||
|
||||
uint16_t m_EnumSize;
|
||||
std::vector<LogViewXdrElement *> m_ChildList;
|
||||
std::vector<LogViewXdrElement*> m_ChildList;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user