Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,161 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* Select Topic data for editing/setting default display data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "topicselector.h"
|
||||
#include "typecodeselectordlg.h"
|
||||
#include "nglsettings.h"
|
||||
#include "topic_tree_model.h"
|
||||
#include "ui_topicselector.h"
|
||||
|
||||
TopicSelector::TopicSelector(Usage usage, QWidget *parent)
|
||||
: NGLDialog(parent)
|
||||
, m_typeCodeInfos(NGLSettings::instance()->infoValues())
|
||||
, m_ui(new Ui::TopicSelector)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
switch (usage)
|
||||
{
|
||||
case Usage::SampleSkeletons:
|
||||
m_ui->nglDialogButtonBox->setStandardButtons(NGLStandardButton::Add | NGLStandardButton::Close);
|
||||
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onAdd, this, &TopicSelector::onAdd);
|
||||
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onClose, this, &TopicSelector::accept);
|
||||
connect(m_ui->tvDataTopics, &QTreeView::doubleClicked, this, &TopicSelector::onAdd);
|
||||
connect(m_ui->tvFunctionTopics, &QTreeView::doubleClicked, this, &TopicSelector::onAdd);
|
||||
setWindowTitle(tr("Select Topic..."));
|
||||
|
||||
break;
|
||||
case Usage::TypeCodeInfos:
|
||||
m_ui->nglDialogButtonBox->setStandardButtons(NGLStandardButton::Ok | NGLStandardButton::Cancel | NGLStandardButton::Edit);
|
||||
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onEdit, this, &TopicSelector::onEdit);
|
||||
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onCancel, this, &TopicSelector::onCancel);
|
||||
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onOk, this, &TopicSelector::onOk);
|
||||
connect(m_ui->tvDataTopics, &QTreeView::doubleClicked, this, &TopicSelector::onEdit);
|
||||
connect(m_ui->tvFunctionTopics, &QTreeView::doubleClicked, this, &TopicSelector::onEdit);
|
||||
// Todo: Better name...
|
||||
setWindowTitle(tr("Select Topic..."));
|
||||
break;
|
||||
}
|
||||
m_treeSrcModelData = new TreeModel(this);
|
||||
m_treeSrcModelData->setWithTypeCode(true);
|
||||
m_dataSortModel = new TopicSortModel(this);
|
||||
m_dataSortModel->setSourceModel(m_treeSrcModelData);
|
||||
m_ui->tvDataTopics->setModel(m_dataSortModel);
|
||||
|
||||
m_treeSrcModelFunction = new TreeModel(this);
|
||||
m_treeSrcModelFunction->setWithTypeCode(true);
|
||||
m_functionSortModel = new TopicSortModel(this);
|
||||
m_functionSortModel->setSourceModel(m_treeSrcModelFunction);
|
||||
m_ui->tvFunctionTopics->setModel(m_functionSortModel);
|
||||
|
||||
// QString = topicName (NOT typeName!)
|
||||
const QMap<std::string, TopicDescriptionEx> dataTopicMap = NGLSettings::instance()->dataTopics();
|
||||
for (auto it = dataTopicMap.constBegin(); it != dataTopicMap.constEnd(); ++it)
|
||||
m_dataSortModel->addData(*it, nullptr);
|
||||
m_dataSortModel->sort(0, Qt::AscendingOrder);
|
||||
|
||||
// QString = topicName (NOT typeName!)
|
||||
const QMap<std::string, TopicDescriptionEx> functionTopicMap = NGLSettings::instance()->functionTopics();
|
||||
for (auto it = functionTopicMap.constBegin(); it != functionTopicMap.constEnd(); ++it)
|
||||
m_functionSortModel->addData(*it, nullptr);
|
||||
m_functionSortModel->sort(0, Qt::AscendingOrder);
|
||||
m_ui->toolBox->setCurrentIndex(0);
|
||||
}
|
||||
|
||||
TopicSelector::~TopicSelector()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
void TopicSelector::onAdd()
|
||||
{
|
||||
TopicDescriptionEx topicDesc;
|
||||
if (m_ui->toolBox->currentWidget() == m_ui->tvFunctionTopics)
|
||||
{
|
||||
const QModelIndexList mil = m_ui->tvFunctionTopics->selectionModel()->selectedRows();
|
||||
if (mil.isEmpty())
|
||||
return;
|
||||
topicDesc = m_functionSortModel->getData(mil.at(0));
|
||||
}
|
||||
else
|
||||
{
|
||||
const QModelIndexList mil = m_ui->tvDataTopics->selectionModel()->selectedRows();
|
||||
if (mil.isEmpty())
|
||||
return;
|
||||
topicDesc = m_dataSortModel->getData(mil.at(0));
|
||||
}
|
||||
emit data(dds::core::xtypes::DynamicData(topicDesc.type), QString::fromStdString(topicDesc.name));
|
||||
}
|
||||
|
||||
void TopicSelector::onEdit()
|
||||
{
|
||||
TopicDescriptionEx topicDesc;
|
||||
if (m_ui->toolBox->currentWidget() == m_ui->tvFunctionTopics)
|
||||
{
|
||||
const QModelIndexList mil = m_ui->tvFunctionTopics->selectionModel()->selectedRows();
|
||||
if (mil.isEmpty())
|
||||
return;
|
||||
topicDesc = m_functionSortModel->getData(mil.at(0));
|
||||
}
|
||||
else
|
||||
{
|
||||
const QModelIndexList mil = m_ui->tvDataTopics->selectionModel()->selectedRows();
|
||||
if (mil.isEmpty())
|
||||
return;
|
||||
topicDesc = m_dataSortModel->getData(mil.at(0));
|
||||
}
|
||||
|
||||
if (m_dialogs.contains(topicDesc.typeName))
|
||||
{
|
||||
m_dialogs[topicDesc.typeName]->raise();
|
||||
return;
|
||||
}
|
||||
|
||||
TypeCodeSelectorDlg *tcsd = new TypeCodeSelectorDlg(this);
|
||||
connect(tcsd, &TypeCodeSelectorDlg::typeCodeInfosChanged,
|
||||
this, &TopicSelector::onTypeCodeInfosChanged);
|
||||
connect(tcsd, &TypeCodeSelectorDlg::finished,
|
||||
this, &TopicSelector::onSubDialogFinished);
|
||||
QString topicName(QString::fromStdString(topicDesc.name));
|
||||
tcsd->init(topicName, m_typeCodeInfos.value(topicName), topicDesc.type);
|
||||
tcsd->show();
|
||||
m_dialogs[topicDesc.name] = tcsd;
|
||||
}
|
||||
|
||||
void TopicSelector::onOk()
|
||||
{
|
||||
NGLSettings::instance()->setInfoValues(m_typeCodeInfos);
|
||||
emit typeCodeInfosChanged();
|
||||
for (TypeCodeSelectorDlg *tcsd : qAsConst(m_dialogs))
|
||||
tcsd->reject();
|
||||
accept();
|
||||
}
|
||||
|
||||
void TopicSelector::onCancel()
|
||||
{
|
||||
for (TypeCodeSelectorDlg *tcsd : qAsConst(m_dialogs))
|
||||
tcsd->reject();
|
||||
reject();
|
||||
}
|
||||
|
||||
void TopicSelector::onSubDialogFinished()
|
||||
{
|
||||
TypeCodeSelectorDlg *tcsd = qobject_cast<TypeCodeSelectorDlg *>(sender());
|
||||
if (!tcsd)
|
||||
return;
|
||||
|
||||
std::string key = m_dialogs.key(tcsd);
|
||||
m_dialogs.remove(key);
|
||||
}
|
||||
|
||||
void TopicSelector::onTypeCodeInfosChanged(const QString &typeCode, const QStringList &infoList)
|
||||
{
|
||||
m_typeCodeInfos[typeCode] = infoList;
|
||||
}
|
||||
Reference in new issue
Block a user