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 "LogViewTelegramSelectionDialog.hpp"
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QListWidget>
|
||||
@@ -22,40 +22,41 @@
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
static int s_currentRow = 0;
|
||||
// ---------------------------------------------------------------
|
||||
LogViewTelegramSelectionDialog::LogViewTelegramSelectionDialog(QWidget *a_parent)
|
||||
: QDialog(a_parent)
|
||||
static int s_currentRow = 0;
|
||||
|
||||
LogViewTelegramSelectionDialog::LogViewTelegramSelectionDialog(QWidget* a_parent)
|
||||
: QDialog(a_parent)
|
||||
{
|
||||
setMinimumSize(QSize(600, 500));
|
||||
QVBoxLayout* layout = new QVBoxLayout;
|
||||
layout->addWidget(new QLabel(tr("Select a telegram:")));
|
||||
m_TelegramList = new QListWidget(this);
|
||||
const auto telegramMap = LogViewTelegram::jsonParser()->telegramsToCreate();
|
||||
for (auto it = telegramMap.cbegin(); it != telegramMap.cend(); ++it)
|
||||
{
|
||||
setMinimumSize(QSize(600, 500));
|
||||
QVBoxLayout *layout = new QVBoxLayout;
|
||||
layout->addWidget(new QLabel(tr("Select a telegram:")));
|
||||
m_TelegramList = new QListWidget(this);
|
||||
const auto telegramMap = LogViewTelegram::jsonParser()->telegramsToCreate();
|
||||
for (auto it = telegramMap.cbegin(); it != telegramMap.cend(); ++it)
|
||||
{
|
||||
if (it.key() == 0) // ACK
|
||||
continue;
|
||||
auto lwi = new QListWidgetItem(it.value() + QStringLiteral(" (%1)").arg(it.key()));
|
||||
lwi->setData(Qt::UserRole, it.key());
|
||||
m_TelegramList->addItem(lwi);
|
||||
}
|
||||
|
||||
m_TelegramList->sortItems();
|
||||
m_TelegramList->setCurrentRow(s_currentRow);
|
||||
connect(m_TelegramList, &QListWidget::itemActivated, this, &LogViewTelegramSelectionDialog::selectTelegram);
|
||||
layout->addWidget(m_TelegramList);
|
||||
|
||||
setLayout(layout);
|
||||
if (it.key() == 0)
|
||||
continue;
|
||||
auto lwi = new QListWidgetItem(it.value() + QStringLiteral(" (%1)").arg(it.key()));
|
||||
lwi->setData(Qt::UserRole, it.key());
|
||||
m_TelegramList->addItem(lwi);
|
||||
}
|
||||
|
||||
m_TelegramList->sortItems();
|
||||
m_TelegramList->setCurrentRow(s_currentRow);
|
||||
connect(m_TelegramList, &QListWidget::itemActivated,
|
||||
this, &LogViewTelegramSelectionDialog::selectTelegram);
|
||||
layout->addWidget(m_TelegramList);
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewTelegramSelectionDialog::selectTelegram(QListWidgetItem *a_telegramItem)
|
||||
{
|
||||
s_currentRow = m_TelegramList->currentRow();
|
||||
m_SelectedTelegramId = a_telegramItem->data(Qt::UserRole).toInt();
|
||||
accept();
|
||||
}
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
} // namespace N_LogView
|
||||
|
||||
|
||||
void LogViewTelegramSelectionDialog::selectTelegram(QListWidgetItem* a_telegramItem)
|
||||
{
|
||||
s_currentRow = m_TelegramList->currentRow();
|
||||
m_SelectedTelegramId = a_telegramItem->data(Qt::UserRole).toInt();
|
||||
accept();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user