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,8 +1,12 @@
/**
* Handle incoming Function Topic Requests (and send them to Tetra)
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#include "recv_from_dds_fts.h"
#include <utility>
#include "main_handler.h"
#include "ism_handler.h"
#include "settings.h"
@@ -50,6 +54,7 @@ RecvFromDdsFts::RecvFromDdsFts(MainHandler *mainHandler, const std::shared_ptr<I
, m_mainHandler(mainHandler)
, m_ftsTab(ftsTab)
, m_txCallback(txCallback)
, m_logger(getLogger("RecvFromDdsFts"))
{
m_categorieData = loadRemainEffectStructMap();
}
@@ -60,7 +65,7 @@ void RecvFromDdsFts::onDemandBiteRequest(const rti::core::SampleIdentity &cookie
data.withSelfTest = request.withSelfTest();
bool bRet = true;
// TODO: fixme
for (const int equipNo : request.equipmentNumbers())
{
data.header.equipmentNumber = equipNo;
@@ -80,7 +85,7 @@ void RecvFromDdsFts::onDemandInitRequest(const rti::core::SampleIdentity &cookie
data.restockCharges = request.restockCharges();
data.restockSanitationMaterial = request.restockSanitationMaterial();
bool bRet = true;
// TODO: fixme
for (const int equipNo : request.equipmentNumbers())
{
data.header.equipmentNumber = equipNo;
@@ -119,7 +124,7 @@ void RecvFromDdsFts::onDemandVulnerabilityStateChangeRequest(const rti::core::Sa
data.vulnerabilityVitalityIndex = getVulnerabilityVitalityIndexFromVitalityAndVba(request.vulnerabilityKind(), request.vitality());
bool bRet = true;
// TODO: fixme
for (const int equipNo : request.equipmentNumbers())
{
data.header.equipmentNumber = equipNo;
@@ -145,7 +150,7 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti
request.subject().is_set() &&
request.message().is_set())
{
// Message to O/C
TetraIcd::EquipmentMessageOC data;
data.senderId = request.sender().get();
data.subject = request.subject().get();
@@ -153,7 +158,7 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
bool bRet = true;
// TODO: fixme
for (const int equipNo : request.equipmentNumbers())
{
data.header.equipmentNumber = equipNo;
@@ -178,7 +183,7 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti
return;
}
bool bRet = true;
// TODO: fixme
for (const int equipNo : request.equipmentNumbers())
{
data.header.equipmentNumber = equipNo;
@@ -250,42 +255,42 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
{
DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
<< " request.chargeTypeId=" << request.chargeTypeId()
<< " request.pdmEventType()=" << request.pdmEventType()
<< " request.eventType()=" << request.eventType()
<< " request.aesId()=" << request.aesId()
<< " aesTypeFromId=" << m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
// NOTE: igniterType/IgniterFunciton = 0 as long as SendCesHitRequest does not contain values
if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(), 0,0}))
{
// special handling for smart - must be send as singleFire
m_ftsTab->sendCesHitReply(cookie,
fillFro(request.participantId(),
m_mainHandler->aesHandler()->sendSingleFireSMArt(request)));
return;
}
TetraIcd::CesHitRequest data;
//test
data.reserve2 = request.originatorEquipmentNumber();
data.reserve1 = request.chargeTypeId();
data.header.equipmentNumber = request.equipmentNumber();
data.header.timeStamp = request.effectTime();
const auto &ct = m_mainHandler->pdmHandler()->chargeTypeFromId(request.chargeTypeId());
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) && (ct.legacyId() > 0))
// GUEZE-359 Steilfeuer mit Sekundaerwirkung wird als Mun 371, ... gesendet. Fuehrt zu Treffer DUS statt WirkSim
//#ifdef GUEZ_MODE
// if ( request.chargeTypeId() > 370 && request.chargeTypeId() < 390 )
// {
// data.chargeTasCodeDirect = 201; // immer den direkten code (fuer wirkfelder: pseudo-osag code >= 201)
// data.chargeTasCodeIndirect = 201;
// }
// else
// {
// data.chargeTasCodeDirect = ct.id(); // immer den direkten code (fuer wirkfelder: pseudo-osag code >= 201)
// data.chargeTasCodeIndirect = ct.id();
// }
//#else
if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) && (ct.legacyId() > 0))
{
data.chargeTasCodeDirect = 201;
data.chargeTasCodeDirect = 201; // immer den direkten code (fuer wirkfelder: pseudo-osag code >= 201)
data.chargeTasCodeIndirect = 201;
}
else if (ct.legacyId() > 0)
@@ -298,25 +303,30 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
data.chargeTasCodeDirect = ct.id();
data.chargeTasCodeIndirect = ct.id();
}
//#endif
data.mineId = request.mineId();
if (request.aesId() != 0)
{
//data.aesTetraIdUnused = m_mainHandler->aesHandler()->tetraIdFromDdsId(request.aesId());
data.aesDdsId = request.aesId();
data.aesType = m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
//TODO: !!!!!! Use new EventType to check which AreaEffectSimulationType will be chosen.
if (request.eventType() == ProjectDataManagement::EventType::ExplosionCluster)
data.aesType = TetraIcd::AreaEffectSimulationType::ExplosionArea;
else
data.aesType = m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
/*!
\brief Take the new event type attribute to check if its is a HazardArea(DangerZone/Gefahrenbereich)
*
* */
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::LeaveHazardDistance) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::EnterHazardDistance))
if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) ||
(request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance))
{
INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime();
data.reserve1 = request.mineId();
data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion;
}
else if (request.pdmEventType() == ProjectDataManagement::PdmEventType::AirSupport)
else if (request.eventType() == ProjectDataManagement::EventType::AirSupport)
{
data.aesType = TetraIcd::AreaEffectSimulationType::AirSupport;
}
@@ -330,15 +340,15 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
data.remainEffectPercent = request.remainEffectPercent();
data.relPosition = m_mainHandler->posHandler()->geographicToRelative(tabPos.position());
// NOTE: igniterType/IgniterFunciton = 0 as long as SendCesHitRequest does not contain values
if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(),0,0}))
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
else if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::HitEffectSimulation)
)
else if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) ||
(request.eventType() == ProjectDataManagement::EventType::HitEffectSimulation) // GUEZE-2873 / GUEZE-2888
) //Gebäude Sekudärwirkung
{
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.pdmEventType()
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType()
<< " equipmentNumber=" << request.equipmentNumber()
<< " originatorEquipmentNumber=" << data.originatorEquipmentNumber
<< " chargeType=" << ct.id()
@@ -346,19 +356,19 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
<< " -> remainEffectTasCodeDirect=" << data.remainEffectTasCodeDirect ;
}
else
data.remainEffectTasCodeDirect = request.remainEffectPercent();
data.remainEffectTasCodeDirect = request.remainEffectPercent();//calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
// [GUEZE-3469] Funktionsraum dekontaminiert faelschlicherweise
if (m_mainHandler->aesHandler()->aesTypeFromId(request.aesId()) == TetraIcd::AreaEffectSimulationType::FunctionalArea)
{
// GUEZSB60_ICD_52_Zentrale-TNE
// 3.3.2.5.9.6 Trefferereignis Sekundärwirkung
// 6 = Funktionsraum 0 = verlassen
// 1 = betreten Meldung wird einmalig beim Betreten des Funktionraums und beim Verlassen gesendet.
// Feld Munitionsart: Betriebsmodus (MS-Byte) / Wartezeit (LS-Byte) für Entgiftungsmaßnahmen
// Feld Verursacher: Funktionsraumkennung
// Feld Reserve1: Betriebsmodus (MS-Byte) / Wartezeit (LS-Byte) für Instandsetzungsmaßnahmen
// Feld Reserve2: Betriebsmodus (MS-Byte) / Wartezeit (LS-Byte) für San.-dienstliche Versorgung
AreaEffectSimulation::FunctionalArea fa = m_mainHandler->aesHandler()->dtcAes()->functionalArea(request.aesId());
DEBUG_LOG(m_logger) << "fa maintMode=" << fa.maintMode()
@@ -374,7 +384,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if (fa.deconMode() == AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime)
{
qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
qint32 lsb = fa.deconTime() / 1000 / 60 / 10;
qint32 lsb = fa.deconTime() / 1000 / 60 / 10; // dissolution in 10 minute steps
data.chargeTasCodeIndirect = msb | lsb;
DEBUG_LOG(m_logger) << "deconMode: remainEffectTasCodeDirect=" << data.chargeTasCodeIndirect
<< " msb=" << msb
@@ -383,7 +393,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if (fa.maintMode() == AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime)
{
qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
qint32 lsb = fa.maintTime() / 1000 / 60 / 10;
qint32 lsb = fa.maintTime() / 1000 / 60 / 10; // dissolution in 10 minute steps
data.reserve1 = msb | lsb;
DEBUG_LOG(m_logger) << "maintMode: reserve1=" << data.reserve1
<< " msb=" << msb
@@ -392,7 +402,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if (fa.medicMode() == AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime)
{
qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
qint32 lsb = fa.medicTime() / 1000 / 60 / 10;
qint32 lsb = fa.medicTime() / 1000 / 60 / 10; // dissolution in 10 minute steps
data.reserve2 = msb | lsb;
DEBUG_LOG(m_logger) << "medicMode: reserve2=" << data.reserve2
<< " msb=" << msb
@@ -446,7 +456,7 @@ void RecvFromDdsFts::onSendParticipantConfigurationRequest(const rti::core::Samp
{
TetraIcd::ParticipantConfiguration data;
data.header.equipmentNumber = request.equipmentNumber();
// positioning
data.positionIntervallVehicle = request.positionIntervallVehicle();
data.positionIntervallPersonell = request.positionIntervallPersonell();
data.positionIntervallAircraft = request.positionIntervallAircraft();
@@ -454,16 +464,16 @@ void RecvFromDdsFts::onSendParticipantConfigurationRequest(const rti::core::Samp
data.heightbarrier = request.heightbarrier();
data.faultPositionHandling = static_cast<TetraIcd::ParticipantConfiguration::FaultPositionHandling>(request.faultPositionHandling().underlying());
data.switchingPositionIntervall = static_cast<TetraIcd::ParticipantConfiguration::SwitchingPositionIntervall>(request.switchingPositionIntervall().underlying());
// radio protocoll parameter
data.waittimeAdditionalBroadcastDemand = request.waittimeAdditionalBroadcastDemand();
data.factorWaittimeIncreaseAtHighload = request.factorWaittimeIncreaseHighload();
// automatic vulnerability increase
data.waittimeAutomaticVulnerabilityIncreaseLevel1 = request.waittimeAutomaticVulnerabilityIncreaseLevel1();
data.waittimeAutomaticVulnerabilityIncreaseLevel2 = request.waittimeAutomaticVulnerabilityIncreaseLevel2();
data.waittimeAutomaticVulnerabilityIncreaseLevel3 = request.waittimeAutomaticVulnerabilityIncreaseLevel3();
// optical code
data.opticalCode = static_cast<TetraIcd::ParticipantConfiguration::OpticalCode>(request.opticalCode().underlying());
// vulnerability model
data.vulnerabilityModel = request.vulnerabilityModel();
data.validTimeOps = request.validTimeOps();
@@ -474,7 +484,7 @@ void RecvFromDdsFts::onSendParticipantBlockedAreaRequest(const rti::core::Sample
{
TetraIcd::CesHitRequest data;
data.header.equipmentNumber = request.equipmentNumber();
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); // TODO
data.aesType = TetraIcd::AreaEffectSimulationType::SpecialArea;
data.remainEffectPercent = request.blockedAreaMode() == BlockedAreaMode::Enter ? 1 : 0;
@@ -485,7 +495,7 @@ void RecvFromDdsFts::onSendParticipantBeStillWarningRequest(const rti::core::Sam
{
TetraIcd::CesHitRequest data;
data.header.equipmentNumber = request.equipmentNumber();
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); // TODO
data.aesType = TetraIcd::AreaEffectSimulationType::BeStillWarning;
data.remainEffectPercent = 0;
@@ -500,7 +510,7 @@ void RecvFromDdsFts::onSendSetSanitationRequest(const rti::core::SampleIdentity
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
data.proceduresTaken = request.sanitationProceduresTaken();
data.sanitationResult = TetraIcd::SanitationResult::NoEffect;
data.sanitationEvaluation = TetraIcd::SanitationEvaluation::Okay;
data.sanitationEvaluation = TetraIcd::SanitationEvaluation::Okay; // To have a 0 for TETRA
data.uniqeId = 0;
data.originatorEquipmentNumber = request.originatorEquipmentNumber();
data.qualification = static_cast<TetraIcd::Qualification>(request.qualification().underlying());
@@ -528,7 +538,7 @@ void RecvFromDdsFts::onSendSelectiveReammunitionRequest(const rti::core::SampleI
void RecvFromDdsFts::onSendResetAllDusMinesRequest(const rti::core::SampleIdentity &cookie, const SendResetAllDusMinesRequest &request)
{
// We actually just need to have the call, no contents.
Q_UNUSED(request);
m_mainHandler->aesHandler()->resetAllDusMines();
@@ -619,7 +629,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c
mission.actions.push_back(action);
bool ret = m_txCallback->txData(mission);
bool ret = m_txCallback->txData(mission); // send waypoint to uav via uas tab plugin
m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber(), ret));
}
@@ -678,7 +688,7 @@ Core::FunctionReplyObject RecvFromDdsFts::fillFro(int participantId, bool bSucce
return Core::FunctionReplyObject(participantId, tr_lts("dds", "Error sending telegram to tetra."));
}
// Charge Type ID is already baseChargeType
int RecvFromDdsFts::getDestructiveCategorie(const int destructiveFactor) const
{
int categorie = 0;
@@ -702,17 +712,17 @@ QMap<int, QVector<RecvFromDdsFts::RemainEffectStruct>> RecvFromDdsFts::loadRemai
{
QMap<int, QVector<RemainEffectStruct>> map;
// remainingEffects liefert ein Array, in einem QJsonObject "verkleidet".
// Dann werden alle keys ermittelt, damit man aus dem Array/QJsonObject
// per value() wieder an die eigentlichen values kommt...
// Sieht irgendwie sehr kompliziert aus. Sollte remainingEffects vielleicht besser ein array liefern???
QJsonObject obj = Settings::remainingEffects();
QVector<RemainEffectStruct> resVec;
QStringList keyList = obj.keys();
for (const auto &key : std::as_const(keyList))
for (const auto &key : qAsConst(keyList))
{
const auto &val = obj.value(key).toObject();
@@ -721,7 +731,7 @@ QMap<int, QVector<RecvFromDdsFts::RemainEffectStruct>> RecvFromDdsFts::loadRemai
QStringList x = val.keys();
int i=0;
for (const auto &resElement : std::as_const(x))
for (const auto &resElement : qAsConst(x))
{
const auto val2 = val.value(resElement).toInt();
@@ -751,11 +761,11 @@ int RecvFromDdsFts::calculateRemainEffectTasCode(int chargeTypeIdBase, int remai
const int categorie = getDestructiveCategorie(destructiveFactor);
const auto &value = m_categorieData.value(categorie);
// must be sorted, but loadRemainEffectStructMap() ensures this.
for (const auto &remainEffect : value)
{
if (remainEffectPercent <= remainEffect.remainEffectMax)
return (remainEffect.chargeTypeId());
return (remainEffect.chargeTypeId()); // always return OSAG as the TNE is not capable of handling ULEIS IED charges (yet).
}
return 0;
}