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/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
+18 -20
View File
@@ -145,8 +145,6 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this))
, m_logger(getLogger("NgsConnector"))
{
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
@@ -214,7 +212,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const ngs::NGSSimWorldException &e)
{
ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
return false;
}
@@ -229,7 +227,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const NGSException &e)
{
ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
return false;
}
player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -279,22 +277,22 @@ void NgsConnector::subscribeAtNgs()
m_enitityNumberCounter = 1;
m_eventCount = 1;
INFO_LOG(m_logger) << "Subscribe at NGS - Human Objects";
INFO_LOG() << "Subscribe at NGS - Human Objects";
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
humanObjClass.subscribeAllAttributes();
humanObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - GroundVehicle Objects";
INFO_LOG() << "Subscribe at NGS - GroundVehicle Objects";
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.subscribeAllAttributes();
groundVehicleObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - LongBowApache Objects";
INFO_LOG() << "Subscribe at NGS - LongBowApache Objects";
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
longBowApacheObjClass.subscribeAllAttributes();
longBowApacheObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - Designator Objects";
INFO_LOG() << "Subscribe at NGS - Designator Objects";
rpr2::IObserverDesignatorObjClass &designatorObjClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
designatorObjClass.subscribeAllAttributes();
designatorObjClass.subscribe();
@@ -323,35 +321,35 @@ void NgsConnector::unsubscribeFromNgs()
if (m_somPlayer)
{
INFO_LOG(m_logger) << "Unsubscribe at NGS - Human Objects";
INFO_LOG() << "Unsubscribe at NGS - Human Objects";
rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
humanObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - GroundVehicle Objects";
INFO_LOG() << "Unsubscribe at NGS - GroundVehicle Objects";
rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - LongBowApache Objects";
INFO_LOG() << "Unsubscribe at NGS - LongBowApache Objects";
rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
longBowApacheObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Designator Objects";
INFO_LOG() << "Unsubscribe at NGS - Designator Objects";
rpr2::IObserverDesignatorObjClass &designatorObjectClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
designatorObjectClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Engagement Reply Interaction";
INFO_LOG() << "Unsubscribe at NGS - Engagement Reply Interaction";
rpr2::IObserverEngagementReplyIntClass &enr = m_somPlayer->getObserverEngagementReplyIntClass(*m_iaEngagementReplyCallback);
enr.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Event Report Interaction";
INFO_LOG() << "Unsubscribe at NGS - Event Report Interaction";
rpr2::IObserverEventReportIntClass &evr = m_somPlayer->getObserverEventReportIntClass(*m_iaEventReportCallback);
evr.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Munition Detonation Interaction";
INFO_LOG() << "Unsubscribe at NGS - Munition Detonation Interaction";
rpr2::IObserverMunitionDetonationIntClass &md = m_somPlayer->getObserverMunitionDetonationIntClass(*m_iaMunitionDetonationCallback);
md.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Weapon Fire Interaction";
INFO_LOG() << "Unsubscribe at NGS - Weapon Fire Interaction";
rpr2::IObserverWeaponFireIntClass &wf = m_somPlayer->getObserverWeaponFireIntClass(*m_iaWeaponFireCallback);
wf.unsubscribe();
}
@@ -517,7 +515,7 @@ bool NgsConnector::sendData(int eqNo, const QByteArray& data, int requestIdentif
vds.NumberOfLongLongs__A__Padding__A__DatumValue.resize(data.size() / 8 + 1);
vds.DatumLengthInBits = 8 * data.size();
TRACE_LOG(m_logger) << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
TRACE_LOG() << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
for (unsigned int i=0; i< vds.NumberOfLongLongs__A__Padding__A__DatumValue.size(); ++i)
{
@@ -684,11 +682,11 @@ void NgsConnector::go()
}
catch (const NGSException &ex)
{
ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
}
catch (const std::exception &e)
{
ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
}
catch (...)
{
@@ -1501,7 +1499,7 @@ void NgsConnector::onNewMunitionDetonation(const rpr2::IObserverMunitionDetonati
const auto &objectIdentifier = interaction.getEventIdentifier().IssuingObjectIdentifier;
int eqId = getEquipmentNoByRTIObjectId(objectIdentifier.ID);
DEBUG_LOG(m_logger) << "Engagement Reply, Issuer: " << eqId;
DEBUG_LOG() << "Engagement Reply, Issuer: " << eqId;
if (m_playerMap.contains(eqId) || objectIdentifier.ID == std::to_string(IdentifierStruct(0).toInt64()))
return;