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,58 +1,59 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#include "LogViewSpinBox.hpp"
|
||||
#include "LogViewField.hpp"
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewSpinBox::LogViewSpinBox(LogViewField *a_field, QWidget *a_parent, const int a_value)
|
||||
: QSpinBox(a_parent)
|
||||
, LogViewWidget(a_field, this, a_parent, false)
|
||||
{
|
||||
// set range
|
||||
uint16_t maxArraySize = a_field->maxArraySize();
|
||||
setRange(0, maxArraySize);
|
||||
|
||||
// set the actual value
|
||||
setValue(a_value);
|
||||
LogViewSpinBox::LogViewSpinBox(LogViewField* a_field, QWidget* a_parent, const int a_value)
|
||||
: QSpinBox(a_parent)
|
||||
, LogViewWidget(a_field, this, a_parent, false)
|
||||
{
|
||||
|
||||
uint16_t maxArraySize = a_field->maxArraySize();
|
||||
setRange(0, maxArraySize);
|
||||
|
||||
// set tooltip-text
|
||||
setToolTip(tr("<nobr>Wertebereich: 0..%1</nobr>").arg(maxArraySize));
|
||||
|
||||
setValue(a_value);
|
||||
|
||||
// connect
|
||||
connect(this, &LogViewSpinBox::editingFinished, this, &LogViewSpinBox::finishEditing);
|
||||
}
|
||||
|
||||
setToolTip(tr("<nobr>Wertebereich: 0..%1</nobr>").arg(maxArraySize));
|
||||
|
||||
|
||||
connect(this, &LogViewSpinBox::editingFinished,
|
||||
this, &LogViewSpinBox::finishEditing);
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewSpinBox::finishEditing()
|
||||
{
|
||||
emit valueEditingFinished(text().toInt());
|
||||
}
|
||||
|
||||
void LogViewSpinBox::finishEditing()
|
||||
{
|
||||
emit valueEditingFinished(text().toInt());
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Writes the content into telegram.
|
||||
// Returns true if successful.
|
||||
// ---------------------------------------------------------------
|
||||
bool LogViewSpinBox::saveContent(LogViewTelegram *a_telegram)
|
||||
{
|
||||
Q_UNUSED(a_telegram);
|
||||
// not yet implemented
|
||||
return false;
|
||||
}
|
||||
|
||||
} // namespace N_LogView
|
||||
|
||||
|
||||
|
||||
bool LogViewSpinBox::saveContent(LogViewTelegram* a_telegram)
|
||||
{
|
||||
Q_UNUSED(a_telegram);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user