lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp
+35 -36
View File
@@ -17,16 +17,15 @@ DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_participantEventId(0)
, m_exerciseId(exerciseId)
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
ERROR_LOG() << "Error initializing dds connections - aborting";
return false;
}
@@ -61,24 +60,24 @@ bool DdsHandler::init(const QStringList &qosFileList)
!m_ftcTab->enableSendParticipantBeStillWarning() ||
!m_ftcTab->enableDemandInit())
{
ERROR_LOG(m_logger) << "Could not enable SendCesHit";
ERROR_LOG() << "Could not enable SendCesHit";
return false;
}
m_ftcBld = Buildings::Interface::Ftc::create(m_ddsConnector);
if (!m_ftcBld->enableSendCesHitOnBuilding())
{
ERROR_LOG(m_logger) << "Could not enable SendCesHitOnBuilding";
ERROR_LOG() << "Could not enable SendCesHitOnBuilding";
return false;
}
if (!m_ftcBld->enableSendCesHit3DonBuilding())
{
ERROR_LOG(m_logger) << "Could not enable SendCesHit3DonBuilding";
ERROR_LOG() << "Could not enable SendCesHit3DonBuilding";
return false;
}
if (!m_ftcBld->enableSetBuildingStates())
{
ERROR_LOG(m_logger) << "Could not enable SetBuildingStates";
ERROR_LOG() << "Could not enable SetBuildingStates";
return false;
}
@@ -87,7 +86,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
if (!m_dtcIsm->enableMainFootprint() ||
!m_dtcIsm->enableMainStructureElement())
{
ERROR_LOG(m_logger) << "Could not enable ISM data topics";
ERROR_LOG() << "Could not enable ISM data topics";
return false;
} // if
m_dtcIsm->waitForHistoricalDataMainFootprint(20000);
@@ -107,16 +106,16 @@ bool DdsHandler::init(const QStringList &qosFileList)
!m_dtcAes->enableDangerArea() ||
!m_dtcAes->enableDusSingleMine())
{
ERROR_LOG(m_logger) << "Could not initialize AES data topics";
ERROR_LOG() << "Could not initialize AES data topics";
return false;
}
DEBUG_LOG(m_logger) << "create FTC AES";
DEBUG_LOG() << "create FTC AES";
m_ftcAes = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init FTC AES";
DEBUG_LOG() << "init FTC AES";
if (!m_ftcAes->enableAll())
{
ERROR_LOG(m_logger) << "Could not initialize AreaEffectSimulation enableType function topic";
ERROR_LOG() << "Could not initialize AreaEffectSimulation enableType function topic";
return false;
}
@@ -126,71 +125,71 @@ bool DdsHandler::init(const QStringList &qosFileList)
if (!m_dtcPdm->enableChargeType())
{
ERROR_LOG(m_logger) << "Could not initialize ProjectDataManagement enableChargeType data topic client";
ERROR_LOG() << "Could not initialize ProjectDataManagement enableChargeType data topic client";
return false;
}
m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
if (!m_dtcPpm->enableDynamicParticipantData())
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
ERROR_LOG() << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
return false;
}
if (!m_dtcPpm->enableParticipantPosition())
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
return false;
}
if (!m_dtcPpm->enableParticipant())
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipant data topic client";
ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipant data topic client";
return false;
}
if (!m_dtcPpm->enableType())
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableType data topic client";
ERROR_LOG() << "Could not initialize ParticipantManagement enableType data topic client";
return false;
}
DEBUG_LOG(m_logger) << "create FTC PPM";
DEBUG_LOG() << "create FTC PPM";
m_ftcPpm = ParticipantManagement::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init FTC PPM";
DEBUG_LOG() << "init FTC PPM";
if (!m_ftcPpm->enableAll())
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableType function topic";
ERROR_LOG() << "Could not initialize ParticipantManagement enableType function topic";
return false;
}
m_dtsTab = TrainingAreaBase::Interface::Dts::create(m_ddsConnector);
if (!m_dtsTab->enableEquipmentPosition())
{
ERROR_LOG(m_logger) << "Could not initialize TrainingAreaBase enableEquipmentPosition data topic server";
ERROR_LOG() << "Could not initialize TrainingAreaBase enableEquipmentPosition data topic server";
return false;
}
if (!m_ftcTab->enableSendParticipantBlockedArea())
{
ERROR_LOG(m_logger) << "Could not initialize TrainingAreaBase enableSendParticipantBlockedArea function";
ERROR_LOG() << "Could not initialize TrainingAreaBase enableSendParticipantBlockedArea function";
return false;
}
m_dtcBld = Buildings::Interface::Dtc::create(m_ddsConnector);
if (!m_dtcBld->enableBuildingState())
{
ERROR_LOG(m_logger) << "Could not initialize Buildings data topic client";
ERROR_LOG() << "Could not initialize Buildings data topic client";
return false;
}
m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
if (!m_dtcTab->enableGeopairingData())
{
ERROR_LOG(m_logger) << "Could not initialize TrainingAreaBase data topic client";
ERROR_LOG() << "Could not initialize TrainingAreaBase data topic client";
return false;
}
m_dtcMdm = MeteoDataManagement::Interface::Dtc::create(m_ddsConnector);
if (!m_dtcMdm->enableMeteoData())
{
ERROR_LOG(m_logger) << "Could not initialize MeteoData data topic client";
ERROR_LOG() << "Could not initialize MeteoData data topic client";
return false;
}
@@ -228,56 +227,56 @@ int DdsHandler::equipNo2ParticipantId(const int equipmentNumber) const
double DdsHandler::chargeTypeRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const double radius = m_dtcPdm->impactRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "chargeTypeRadius = " << radius;
DEBUG_LOG() << "chargeTypeRadius = " << radius;
return radius;
} // getRadiusOfMunition
double DdsHandler::chargeHeight(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const double height = m_dtcPdm->height(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "chargeHeight = " << height;
DEBUG_LOG() << "chargeHeight = " << height;
return height;
}
bool DdsHandler::isSmartChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const bool isSmart = m_dtcPdm->isSmart(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "isSmartChargeType = " << isSmart;
DEBUG_LOG() << "isSmartChargeType = " << isSmart;
return isSmart;
} // isSmartType
bool DdsHandler::isSmoke(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const bool isSmoke = m_dtcPdm->isSmoke(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "isSmoke = " << isSmoke;
DEBUG_LOG() << "isSmoke = " << isSmoke;
return isSmoke;
} // isSmoke
bool DdsHandler::isLaserGuidable(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const bool isLaserGuidable = m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "isLaserGuidable = " << isLaserGuidable;
DEBUG_LOG() << "isLaserGuidable = " << isLaserGuidable;
return isLaserGuidable;
}
bool DdsHandler::isJamming(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const bool isJamming = m_dtcPdm->isJamming(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "isJamming = " << isJamming;
DEBUG_LOG() << "isJamming = " << isJamming;
return isJamming;
}
bool DdsHandler::isDus(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const bool isDus = m_dtcPdm->mineClass(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId())== AreaEffectSimulation::MineClass::Concrete;
DEBUG_LOG(m_logger) << "isDus = " << isDus;
DEBUG_LOG() << "isDus = " << isDus;
return isDus;
}
bool DdsHandler::isAtMine(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const bool isAtMine = m_dtcPdm->isAtMine(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "isAtMine = " << isAtMine;
DEBUG_LOG() << "isAtMine = " << isAtMine;
return isAtMine;
}
@@ -286,7 +285,7 @@ ProjectDataManagement::VolatilityType DdsHandler::volatilityTypeId(const AreaEff
const ProjectDataManagement::VolatilityType volatilityType= m_dtcPdm->volatilityTypeId(chargeStruct.chargeTypeId(),
chargeStruct.igniterTypeId(),
chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "volatilityType=" << volatilityType;
DEBUG_LOG() << "volatilityType=" << volatilityType;
return volatilityType;
}
@@ -330,14 +329,14 @@ int32_t DdsHandler::getLegacyIdFromChargeTypeId(const AreaEffectSimulation::Char
{
int32_t legacyId = 0;
legacyId = m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()).chargeLegacyId();
DEBUG_LOG(m_logger) << "legacyId = " << legacyId;
DEBUG_LOG() << "legacyId = " << legacyId;
return legacyId;
}
int DdsHandler::searchRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct)
{
const int searchRadius = m_dtcPdm->searchRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
DEBUG_LOG(m_logger) << "searchRadius = " << searchRadius;
DEBUG_LOG() << "searchRadius = " << searchRadius;
return searchRadius;
} // searchRadius