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 "LogViewTextEdit.hpp"
|
||||
#include "LogViewField.hpp"
|
||||
#include "LogViewTelegram.hpp"
|
||||
@@ -18,78 +18,79 @@
|
||||
namespace N_LogView
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewTextEdit::LogViewTextEdit(LogViewField *a_field, QWidget *a_parent, const bool a_readonly)
|
||||
: QLineEdit(a_parent)
|
||||
, LogViewWidget(a_field, this, a_parent, a_readonly)
|
||||
|
||||
LogViewTextEdit::LogViewTextEdit(LogViewField* a_field, QWidget* a_parent, const bool a_readonly)
|
||||
: QLineEdit(a_parent)
|
||||
, LogViewWidget(a_field, this, a_parent, a_readonly)
|
||||
{
|
||||
const QString value = a_field->value(0);
|
||||
setText(value);
|
||||
|
||||
if (a_readonly)
|
||||
{
|
||||
const QString value = a_field->value(0);
|
||||
setText(value);
|
||||
setReadOnly(true);
|
||||
setAlignment(a_field->isRightAligned() ? Qt::AlignRight : Qt::AlignLeft);
|
||||
}
|
||||
|
||||
if (a_readonly)
|
||||
{
|
||||
setReadOnly(true);
|
||||
setAlignment(a_field->isRightAligned() ? Qt::AlignRight : Qt::AlignLeft);
|
||||
}
|
||||
|
||||
uint16_t maxArraySize = a_field->maxArraySize();
|
||||
setMaxLength(maxArraySize);
|
||||
updateToolTip(value);
|
||||
|
||||
// set a validator for number of chars
|
||||
uint16_t maxArraySize = a_field->maxArraySize();
|
||||
setMaxLength(maxArraySize);
|
||||
updateToolTip(value);
|
||||
|
||||
// make proper width of widget
|
||||
QFontMetrics fm(font());
|
||||
|
||||
QFontMetrics fm(font());
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
|
||||
setMinimumWidth(fm.width(QLatin1Char(' ') + value + QLatin1Char(' ')));
|
||||
setMinimumWidth(fm.width(QLatin1Char(' ') + value + QLatin1Char(' ')));
|
||||
#else
|
||||
setMinimumWidth(fm.horizontalAdvance(QLatin1Char(' ') + value + QLatin1Char(' ')));
|
||||
setMinimumWidth(fm.horizontalAdvance(QLatin1Char(' ') + value + QLatin1Char(' ')));
|
||||
#endif
|
||||
|
||||
// connect signals
|
||||
connect(this, &LogViewTextEdit::editingFinished, this, &LogViewTextEdit::checkAndOvertakeContent);
|
||||
}
|
||||
|
||||
connect(this, &LogViewTextEdit::editingFinished,
|
||||
this, &LogViewTextEdit::checkAndOvertakeContent);
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewTextEdit::checkAndOvertakeContent()
|
||||
|
||||
void LogViewTextEdit::checkAndOvertakeContent()
|
||||
{
|
||||
updateToolTip(text());
|
||||
m_Valid = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
bool LogViewTextEdit::saveContent(LogViewTelegram* a_telegram)
|
||||
{
|
||||
if (!isValid())
|
||||
return false;
|
||||
if (a_telegram->isJsonTelegram())
|
||||
{
|
||||
updateToolTip(text()); // fixme nach jedem zeichen updaten
|
||||
m_Valid = true;
|
||||
a_telegram->setJsonValue(m_Field->jsonPath(), text());
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Writes the content into telegram.
|
||||
// Returns true if successful.
|
||||
// ---------------------------------------------------------------
|
||||
bool LogViewTextEdit::saveContent(LogViewTelegram *a_telegram)
|
||||
else
|
||||
{
|
||||
if (!isValid())
|
||||
return false;
|
||||
if (a_telegram->isJsonTelegram())
|
||||
uint16_t size = getSize();
|
||||
QString content = text();
|
||||
uint16_t arraySize;
|
||||
if (m_Field->isDynamicArray())
|
||||
{
|
||||
a_telegram->setJsonValue(m_Field->jsonPath(), text());
|
||||
arraySize = content.length();
|
||||
a_telegram->setUIntX(LogViewTelegram::SIZE_CENTRAL_DYN_ARRAY_SIZE, arraySize);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
uint16_t size = getSize();
|
||||
QString content = text();
|
||||
uint16_t arraySize;
|
||||
if (m_Field->isDynamicArray())
|
||||
{
|
||||
arraySize = content.length();
|
||||
a_telegram->setUIntX(LogViewTelegram::SIZE_CENTRAL_DYN_ARRAY_SIZE, arraySize);
|
||||
// fixme: bei vielen Telegrammen muss Länge auf die Länge des Textes gesetzt werden. Dies kann nicht automatisch gemacht werden. Aber vielleicht kann man schauen, ob vor dem dyn. Array ein Feld Länge vorkommt, oder hartcodieren, oder konfigurierbaren
|
||||
}
|
||||
else
|
||||
{
|
||||
arraySize = m_Field->maxArraySize();
|
||||
}
|
||||
|
||||
// copy the text
|
||||
for (int i = 0; i < arraySize; i++)
|
||||
a_telegram->setUIntX(size, i < content.length() ? content[i].toLatin1() : 0);
|
||||
arraySize = m_Field->maxArraySize();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace N_LogView
|
||||
|
||||
for (int i = 0; i < arraySize; i++)
|
||||
a_telegram->setUIntX(size, i < content.length() ? content[i].toLatin1() : 0);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user