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$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#include "LogViewXdrStruct.hpp"
|
||||
#include "LogViewXdrValue.hpp"
|
||||
#include "LogViewXdrType.hpp"
|
||||
@@ -18,94 +18,88 @@
|
||||
namespace N_LogView
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrStruct::LogViewXdrStruct(const QString &a_name, const LogViewXdrElement::E_ElementKind a_kind, uint16_t enumSize)
|
||||
: LogViewXdrElement(a_name, a_kind, "LogViewXdrStruct")
|
||||
, m_EnumSize(enumSize)
|
||||
|
||||
LogViewXdrStruct::LogViewXdrStruct(const QString& a_name, const LogViewXdrElement::E_ElementKind a_kind, uint16_t enumSize)
|
||||
: LogViewXdrElement(a_name, a_kind, "LogViewXdrStruct")
|
||||
, m_EnumSize(enumSize)
|
||||
{
|
||||
}
|
||||
|
||||
LogViewXdrStruct::~LogViewXdrStruct()
|
||||
{
|
||||
for (auto ptr : m_ChildList)
|
||||
delete ptr;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void LogViewXdrStruct::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, const int16_t a_lastBit, const bool a_isLast)
|
||||
{
|
||||
m_ChildList.push_back(new LogViewXdrType(a_name, a_type, a_arraySize, a_dynArrayOffset, a_kind, a_firstBit, a_lastBit, a_isLast));
|
||||
}
|
||||
|
||||
|
||||
void LogViewXdrStruct::addElement(const QString& a_name, const uint32_t a_value, const E_ElementKind a_kind)
|
||||
{
|
||||
m_ChildList.push_back(new LogViewXdrValue(a_name, a_value, a_kind));
|
||||
}
|
||||
|
||||
|
||||
|
||||
LogViewXdrElement* LogViewXdrStruct::getChild(const uint32_t a_childIndex) const
|
||||
{
|
||||
if (m_ChildList.size() > a_childIndex)
|
||||
return m_ChildList[a_childIndex];
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
|
||||
LogViewXdrType* LogViewXdrStruct::getChildAsType(const uint32_t a_childIndex) const
|
||||
{
|
||||
return static_cast<LogViewXdrType*>(getChild(a_childIndex));
|
||||
}
|
||||
|
||||
|
||||
|
||||
LogViewXdrValue* LogViewXdrStruct::getChildAsValue(const uint32_t a_childIndex) const
|
||||
{
|
||||
return static_cast<LogViewXdrValue*>(getChild(a_childIndex));
|
||||
}
|
||||
|
||||
|
||||
|
||||
void LogViewXdrStruct::dump() const
|
||||
{
|
||||
INFO_LOG(m_logger) << "Element[" << getName().toStdString() << "]: kind=" << getKindName().toStdString() << " enumSize=" << getEnumSize();
|
||||
INFO_LOG(m_logger) << "-------------- childs start -----------------";
|
||||
|
||||
std::vector<LogViewXdrElement*>::const_iterator iter = m_ChildList.begin();
|
||||
while (iter != m_ChildList.end())
|
||||
{
|
||||
(*iter)->dump();
|
||||
++iter;
|
||||
}
|
||||
INFO_LOG(m_logger) << "-------------- childs end -----------------";
|
||||
}
|
||||
|
||||
LogViewXdrStruct::~LogViewXdrStruct()
|
||||
|
||||
uint32_t LogViewXdrStruct::getChildValue(const QString& a_name, bool* a_error) const
|
||||
{
|
||||
if (a_error)
|
||||
*a_error = false;
|
||||
std::vector<LogViewXdrElement*>::const_iterator iter = m_ChildList.begin();
|
||||
while (iter != m_ChildList.end())
|
||||
{
|
||||
for (auto ptr : m_ChildList)
|
||||
delete ptr;
|
||||
if ((*iter)->getName() == a_name)
|
||||
return static_cast<const LogViewXdrValue*>(*iter)->getValue();
|
||||
++iter;
|
||||
}
|
||||
if (a_error)
|
||||
*a_error = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewXdrStruct::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,
|
||||
const int16_t a_lastBit,
|
||||
const bool a_isLast)
|
||||
{
|
||||
m_ChildList.push_back(new LogViewXdrType(a_name, a_type, a_arraySize, a_dynArrayOffset, a_kind, a_firstBit, a_lastBit, a_isLast));
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewXdrStruct::addElement(const QString &a_name, const uint32_t a_value, const E_ElementKind a_kind)
|
||||
{
|
||||
m_ChildList.push_back(new LogViewXdrValue(a_name, a_value, a_kind));
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrElement *LogViewXdrStruct::getChild(const uint32_t a_childIndex) const
|
||||
{
|
||||
if (m_ChildList.size() > a_childIndex)
|
||||
return m_ChildList[a_childIndex];
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrType *LogViewXdrStruct::getChildAsType(const uint32_t a_childIndex) const
|
||||
{
|
||||
return static_cast<LogViewXdrType *>(getChild(a_childIndex)); // fixme: check ob es wirklich ein XdrType ist
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrValue *LogViewXdrStruct::getChildAsValue(const uint32_t a_childIndex) const
|
||||
{
|
||||
return static_cast<LogViewXdrValue *>(getChild(a_childIndex)); // fixme: check ob es wirklich ein XdrValue ist
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewXdrStruct::dump() const
|
||||
{
|
||||
INFO_LOG(m_logger) << "Element[" << getName().toStdString() << "]: kind=" << getKindName().toStdString() << " enumSize=" << getEnumSize();
|
||||
INFO_LOG(m_logger) << "-------------- childs start -----------------";
|
||||
|
||||
std::vector<LogViewXdrElement *>::const_iterator iter = m_ChildList.begin();
|
||||
while (iter != m_ChildList.end())
|
||||
{
|
||||
(*iter)->dump();
|
||||
++iter;
|
||||
}
|
||||
INFO_LOG(m_logger) << "-------------- childs end -----------------";
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
uint32_t LogViewXdrStruct::getChildValue(const QString &a_name, bool *a_error) const
|
||||
{
|
||||
if (a_error)
|
||||
*a_error = false;
|
||||
std::vector<LogViewXdrElement *>::const_iterator iter = m_ChildList.begin();
|
||||
while (iter != m_ChildList.end())
|
||||
{
|
||||
if ((*iter)->getName() == a_name)
|
||||
return static_cast<const LogViewXdrValue *>(*iter)->getValue();
|
||||
++iter;
|
||||
}
|
||||
if (a_error)
|
||||
*a_error = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace N_LogView
|
||||
Reference in new issue
Block a user