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,21 @@
/**
* @RDE_HEADER@
* HlaDispatcher for AdlerJson Plugin
* $Id: hla_dispatcher.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/hla_dispatcher.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QVector>
#include <QtWebSockets/QWebSocket>
#include <Core/core_types.h>
#include <QHash>
#include <QObject>
#include <QVector>
#include <QWebSocket>
#include <DDS/Core/function_reply_object.h> // tr_lts
#include <TrainingAreaBase/tab_plugin_interface.h>
// #include "logger.h"
#include "aes_handler.h"
#include "asm_handler.h"
#include "flm_handler.h"
@@ -19,10 +25,10 @@
#include "telegrams.h"
#include "ws_interface.h"
// #include <NotificationManagement/nom_ftc.h>
#include <NotificationManagement/nom_enums.hpp>
// #include <TrainingAreaBase/tab_dts.h>
// #include <TrainingAreaBase/tab_fts.h>
class QTimer;
namespace AdlerJson
@@ -31,7 +37,7 @@ using namespace TrainingAreaBase;
class JsonHandlerRx;
class JsonHandlerTx;
class DdsHandler;
// class EXStatus;
struct TrajectoryIdentifier
{
@@ -66,7 +72,7 @@ class JsonDispatcher final
std::shared_ptr<SAAInterface> getSAAByParty(const int partyId);
std::shared_ptr<SAAInterface> getSAAByWs(const int wsId);
QString getSender() { return QStringLiteral("EXCON@GUEZ.DE"); }
// SendToTele
bool sendExFeuerbereit(const ExFeuerbereit &exFBDataIn, const int partyId);
bool sendExAbgefeuert(const ExAbgefeuert &exAFDataIn, int partyId);
bool sendExMqManuelleQuittung(const ExMqManuelleQuittung &exMQDataIn, int partyId);
@@ -74,7 +80,7 @@ class JsonDispatcher final
bool sendExVollzugsmeldung(const ExVollzugsmeldung &exVZDataIn, int partyId);
void onAdlerCalculateTrajectoryRequest(const rti::core::SampleIdentity &cookie, const TrainingAreaBase::AdlerCalculateTrajectoryRequest &request) override;
int getAssetId(const QString &saaName) const;
// misc
void cleanupSaaInterfaces(const QString &saaName, int wsId, int partyId);
void getCreateNotificationRequestData(const int wsId,
const QString &title,
@@ -92,6 +98,7 @@ class JsonDispatcher final
void onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS);
void onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS);
void onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP);
void sendParticipantInfoNotification(const int wsId, const int partyId, const bool isVerbund, const Einheit &einheit);
void onSAAHXGuidingLines(const int wsId, const Koordinierungsdaten &koordinierungsdaten);
void onSAAHXGuidingLinesAndBoundaries(const int wsId, const Fuehrungsdaten &fuehrungsdaten);
void onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuerhaltdaten);
@@ -115,7 +122,6 @@ class JsonDispatcher final
void websocketConnected(quint16 port);
private:
NGL::INGLLogger &m_logger;
QUrl webSocketUrl() const;
bool isConnectionTest(QJsonDocument &doc);
QString getParticipantInfoLink(const QString &verein, const int partyId, const bool isVerbund);
@@ -123,11 +129,10 @@ class JsonDispatcher final
std::shared_ptr<SAAInterface> getSAAByName(const QString &saaName);
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
std::shared_ptr<JsonHandlerRx> m_recvFromWebsocket;
std::shared_ptr<JsonHandlerTx> m_sendToWebsocket;
// DDS
MainDispatcher *m_mainDispatcher;
std::shared_ptr<FlmHandler> m_flmHandler;
std::shared_ptr<PpmHandler> m_ppmHandler;
@@ -139,8 +144,8 @@ class JsonDispatcher final
QVector<std::shared_ptr<SAAInterface>> m_saaInterfaces;
QMap<int, QTimer *> m_connectionKeepaliveTimer;
QHash<QString, TrajectoryIdentifier> m_trajectoryIdentifier;
QHash<QString, Core::GeoPosition> m_positionsLaunch;
QHash<QString, TrajectoryIdentifier> m_trajectoryIdentifier; // key = exFlugbahnberechnung.uuid
QHash<QString, Core::GeoPosition> m_positionsLaunch; // key = exFlugbahnberechnung.uuid
NGL::Settings *m_settings;
QWebSocket *m_webSocket;
@@ -149,6 +154,7 @@ class JsonDispatcher final
bool m_bWarnedOnce;
rti::core::SampleIdentity m_cookieCalculateTrajectoryAdler;
int m_explosionIndex;
NGL::INGLLogger &m_logger;
};
}
} // namespace AdlerJson