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:
torstenandCopilot committed 2026-09-15 18:20:26 +00:00
1 parent f23384bb68
commit 7173785915
18662 files changed
+4115092 -5435

No files matched your search

@@ -1,15 +1,22 @@
/**
* DdsHandler for DDS
* $Id$
* $HeadURL$
* $Author$
* Created by Philipp Dassow, NLST, 2018-01-23
*/
#include "dds_handler.h"
#include <Core/pacemaker.h>
#include <DDS/Core/pacemaker.h>
namespace TrainingAreaBaseOC
{
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
@@ -21,13 +28,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
return false;
}
// default initialize Publisher and Subscriber
m_ddsConnector->initPublisherSubscriber();
m_dtcCore = Core::Interface::Dtc::create(m_ddsConnector);
bool bRet = m_dtcCore->enablePartitionTime();
// Pacemaker
m_pacemaker = std::make_shared<Core::Pacemaker>(m_ddsConnector);
m_dtsTaboc = Interface::Dts::create(m_ddsConnector);
@@ -58,4 +65,4 @@ qint64 DdsHandler::currentPartitionTime() const
return m_dtcCore->partitionTime().timeStamp();
}
}
} // Namespace PDM
@@ -1,9 +1,14 @@
/**
* DdsHandler for DDS
* $Id$
* $HeadURL$
* $Author$
* Created by Philipp Dassow, NLST, 2018-01-23
*/
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <Core/core_dtc.h>
#include <DDS/Core/core_dtc.h>
#include <TrainingAreaBaseOC/taboc_dts.h>
#include <TrainingAreaBaseOC/taboc_fts.h>
@@ -68,7 +73,6 @@ public:
qint64 currentPartitionTime() const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<Core::Interface::Dtc> m_dtcCore;
@@ -77,6 +81,8 @@ private:
std::shared_ptr<Interface::Fts> m_ftsTaboc;
std::shared_ptr<TrainingAreaBase::Interface::Dts> m_dtsTab;
std::shared_ptr<TrainingAreaBase::Interface::Fts> m_ftsTab;
NGL::INGLLogger &m_logger;
};
}
@@ -1,15 +1,21 @@
/**
* MainHandler for OC-connection to the SFM
* $Id$
* $HeadURL$
* $Author$
* Created by Philipp Dassow, NLST, 2018-01-23
*/
#include "main_handler.h"
#include "settings.h"
#include "logger.h"
#include <Core/pacemaker.h>
#include <DDS/Core/pacemaker.h>
namespace TrainingAreaBaseOC
{
MainHandler::MainHandler(QObject *parent) : QObject(parent)
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_aesDtc(nullptr)
, m_aesFtc(nullptr)
, m_pdmDtc(nullptr)
@@ -18,8 +24,9 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_ddsHandler(nullptr)
, m_rxHandler(nullptr)
, m_ftsHandler(nullptr)
, m_websocketHandler(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_websocketHandler(nullptr)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
{
@@ -35,7 +42,7 @@ MainHandler::~MainHandler()
bool MainHandler::init(int domainId, int exerciseId)
{
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
if (!m_ddsHandler->init())
{
@@ -43,19 +50,19 @@ bool MainHandler::init(int domainId, int exerciseId)
return false;
}
// create AES Dtc
m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->ddsConnector());
DEBUG_LOG(m_logger) << "Created AES Dtc";
// create AES Ftc
m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->ddsConnector());
DEBUG_LOG(m_logger) << "Created AES Ftc";
// create PDM Dtc
m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
DEBUG_LOG(m_logger) << "Created PDM Dtc";
// ConnectionHandler
m_connectionHandler = std::make_shared<ConnectionHandler>();
if (!m_connectionHandler->init())
@@ -64,10 +71,10 @@ bool MainHandler::init(int domainId, int exerciseId)
return false;
}
// to DDS
m_rxHandler = std::make_shared<SendToDds>(this);
// CanagHandler / to TrainingArea
m_canagHandler = std::make_shared<CanagHandler>(this);
if (!m_canagHandler->init())
@@ -77,7 +84,7 @@ bool MainHandler::init(int domainId, int exerciseId)
}
// from DDS
m_ftsHandler = std::make_shared<RecvFromDdsFts>(this);
#ifndef GUEZ_MODE
m_websocketHandler = std::make_shared<WebsocketHandler>(this, exerciseId, m_ddsHandler->dtsTaboc(), m_ddsHandler->dtcTaboc());
@@ -88,4 +95,4 @@ bool MainHandler::init(int domainId, int exerciseId)
return true;
}
}
} // namespace TrainingAreaBaseOC