Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -50,7 +50,6 @@ 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();
}
@@ -175,7 +174,7 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti
else
{
m_ftsTab->sendEquipmentMessageReply(cookie, fillFro(0, false));
ERROR_LOG(m_logger) << "Got SendEquipmentMessageRequest but neither message nor messageId is set!";
ERROR_LOG() << "Got SendEquipmentMessageRequest but neither message nor messageId is set!";
return;
}
bool bRet = true;
@@ -249,7 +248,7 @@ void RecvFromDdsFts::onSendCesHitInformationRequest(const rti::core::SampleIdent
void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie, const SendCesHitRequest &request)
{
DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
DEBUG_LOG() << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
<< " request.chargeTypeId=" << request.chargeTypeId()
<< " request.eventType()=" << request.eventType()
<< " request.aesId()=" << request.aesId()
@@ -313,7 +312,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) ||
(request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance))
{
INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime();
INFO_LOG() << "HarzardArea: " << request.effectTime();
data.reserve1 = request.mineId();
data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion;
}
@@ -339,7 +338,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
)
{
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType()
DEBUG_LOG() << "PDM::EventType = " << request.eventType()
<< " equipmentNumber=" << request.equipmentNumber()
<< " originatorEquipmentNumber=" << data.originatorEquipmentNumber
<< " chargeType=" << ct.id()
@@ -362,7 +361,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
AreaEffectSimulation::FunctionalArea fa = m_mainHandler->aesHandler()->dtcAes()->functionalArea(request.aesId());
DEBUG_LOG(m_logger) << "fa maintMode=" << fa.maintMode()
DEBUG_LOG() << "fa maintMode=" << fa.maintMode()
<< " maintTime=" <<fa.maintTime()
<< " deconMode=" << fa.deconMode()
<< " deconTime=" << fa.deconTime()
@@ -377,7 +376,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
qint32 lsb = fa.deconTime() / 1000 / 60 / 10;
data.chargeTasCodeIndirect = msb | lsb;
DEBUG_LOG(m_logger) << "deconMode: remainEffectTasCodeDirect=" << data.chargeTasCodeIndirect
DEBUG_LOG() << "deconMode: remainEffectTasCodeDirect=" << data.chargeTasCodeIndirect
<< " msb=" << msb
<< " lsb=" << lsb;
}
@@ -386,7 +385,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
qint32 lsb = fa.maintTime() / 1000 / 60 / 10;
data.reserve1 = msb | lsb;
DEBUG_LOG(m_logger) << "maintMode: reserve1=" << data.reserve1
DEBUG_LOG() << "maintMode: reserve1=" << data.reserve1
<< " msb=" << msb
<< " lsb=" << lsb;
}
@@ -395,7 +394,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
qint32 lsb = fa.medicTime() / 1000 / 60 / 10;
data.reserve2 = msb | lsb;
DEBUG_LOG(m_logger) << "medicMode: reserve2=" << data.reserve2
DEBUG_LOG() << "medicMode: reserve2=" << data.reserve2
<< " msb=" << msb
<< " lsb=" << lsb;
}
@@ -406,7 +405,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
void RecvFromDdsFts::onSendParticipantSwVerionsRequest(const rti::core::SampleIdentity &cookie, const SendParticipantSwVerionsRequest &request)
{
DEBUG_LOG(m_logger) << "onSendParticipantSwVerionsRequest: " << request.equipmentNumber() << " - " << request.equipmentFunctionId();
DEBUG_LOG() << "onSendParticipantSwVerionsRequest: " << request.equipmentNumber() << " - " << request.equipmentFunctionId();
TetraIcd::ParticipantSwVersionsRequest data;
data.header.equipmentNumber = request.equipmentNumber();
@@ -490,7 +489,7 @@ void RecvFromDdsFts::onSendParticipantBeStillWarningRequest(const rti::core::Sam
data.aesType = TetraIcd::AreaEffectSimulationType::BeStillWarning;
data.remainEffectPercent = 0;
WARNING_LOG(m_logger) << "sendParticipantBeStillWarningReply equipmentNumber=" << request.equipmentNumber();
WARNING_LOG() << "sendParticipantBeStillWarningReply equipmentNumber=" << request.equipmentNumber();
m_ftsTab->sendParticipantBeStillWarningReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data)));
}
@@ -510,7 +509,7 @@ void RecvFromDdsFts::onSendSetSanitationRequest(const rti::core::SampleIdentity
void RecvFromDdsFts::onSendSelectiveReammunitionRequest(const rti::core::SampleIdentity &cookie, const SendSelectiveReammunitionRequest &request)
{
DEBUG_LOG(m_logger) << "onSendSelectiveReammunitionRequest for equipment number: " << request.equipmentNumber();
DEBUG_LOG() << "onSendSelectiveReammunitionRequest for equipment number: " << request.equipmentNumber();
TetraIcd::SelectiveReammunition data;
data.header.equipmentNumber = request.equipmentNumber();
data.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -558,7 +557,7 @@ void RecvFromDdsFts::onSetDevicePowerRequest(const rti::core::SampleIdentity &co
void RecvFromDdsFts::onAdlerCalculateTrajectoryRequest(const rti::core::SampleIdentity &cookie, const AdlerCalculateTrajectoryRequest &request)
{
DEBUG_LOG(m_logger) << "onSendCalculateTrajectoryAdlerRequest";
DEBUG_LOG() << "onSendCalculateTrajectoryAdlerRequest";
}
@@ -588,7 +587,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c
mission.missionName = QString::fromStdString(request.name());
mission.missionId = request.planId();
ERROR_LOG(m_logger) << "####################### request.equipmentNumber(): " << request.equipmentNumber() << ", request.name(): " << request.name() << ", mission.header.equipmentNumber: " << mission.header.equipmentNumber << ", properties: " << request.properties();
ERROR_LOG() << "####################### request.equipmentNumber(): " << request.equipmentNumber() << ", request.name(): " << request.name() << ", mission.header.equipmentNumber: " << mission.header.equipmentNumber << ", properties: " << request.properties();
TetraIcd::UAVAction action;
action.task = TetraIcd::UAVActionTask::Loiter;
@@ -609,7 +608,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c
}
catch (const std::exception &ex)
{
ERROR_LOG(m_logger) << "props is missing critical values: " << ex.what();
ERROR_LOG() << "props is missing critical values: " << ex.what();
m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber(), false));
return;
}
@@ -773,7 +772,7 @@ uint32_t RecvFromDdsFts::getVulnerabilityVitalityIndexFromVitalityAndVba(uint32_
vitality += 1;
if (vitality > 11)
{
ERROR_LOG(m_logger) << "Cant convert Vitality!";
ERROR_LOG() << "Cant convert Vitality!";
return 0;
}
}