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:
2785 files changed
+18754
-18316
No files matched your search
@@ -13,7 +13,6 @@ namespace GuezNasat
|
||||
|
||||
Participant2Dds::Participant2Dds(const dds::domain::DomainParticipant &domainParticipant, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainParticipant, IDL::PartitionType::Exercise, exerciseId))
|
||||
, m_logger(getLogger("Participant2Dds"))
|
||||
{
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
@@ -27,22 +26,22 @@ Participant2Dds::Participant2Dds(const dds::domain::DomainParticipant &domainPar
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " create FTC..." << " exerciseId=" << exerciseId;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " create FTC..." << " exerciseId=" << exerciseId;
|
||||
|
||||
m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
|
||||
if (!m_aesFtc->enableAirSupportImpactModify())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable AES AirSupportImpactModify FTC for"
|
||||
ERROR_LOG() << "Could not enable AES AirSupportImpactModify FTC for"
|
||||
<< " exerciseId=" << exerciseId;
|
||||
m_aesFtc = nullptr;
|
||||
}
|
||||
if (!m_aesFtc->enableExplosionClusterModify())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable AES enableExplosionClusterModify FTC for"
|
||||
ERROR_LOG() << "Could not enable AES enableExplosionClusterModify FTC for"
|
||||
<< " exerciseId=" << exerciseId;
|
||||
m_aesFtc = nullptr;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " create FTC..." << " exerciseId=" << exerciseId << " Done: " << m_aesFtc.get();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " create FTC..." << " exerciseId=" << exerciseId << " Done: " << m_aesFtc.get();
|
||||
}
|
||||
|
||||
bool Participant2Dds::publish(const TrainingAreaBase::EquipmentPosition &pos)
|
||||
@@ -52,7 +51,7 @@ bool Participant2Dds::publish(const TrainingAreaBase::EquipmentPosition &pos)
|
||||
m_tabDts = TrainingAreaBase::Interface::Dts::create(m_ddsConnector);
|
||||
if (!m_tabDts->enableEquipmentPosition())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable TAB equipment position DTS for "
|
||||
ERROR_LOG() << "Could not enable TAB equipment position DTS for "
|
||||
<< m_ddsConnector->getDefaultPartition();
|
||||
m_tabDts = nullptr;
|
||||
return false;
|
||||
@@ -81,7 +80,7 @@ bool Participant2Dds::publish(const GuezNasat::Nasat9Liner &nl)
|
||||
m_gnaDts = GuezNasat::Interface::Dts::create(m_ddsConnector);
|
||||
if (!m_gnaDts->enableNasat9Liner())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable GNA Nasat9Liner DTS for "
|
||||
ERROR_LOG() << "Could not enable GNA Nasat9Liner DTS for "
|
||||
<< m_ddsConnector->getDefaultPartition();
|
||||
m_gnaDts = nullptr;
|
||||
return false;
|
||||
@@ -93,13 +92,13 @@ bool Participant2Dds::publish(const GuezNasat::Nasat9Liner &nl)
|
||||
|
||||
void Participant2Dds::addParticipantToWatch(int participantId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "addParticipantToWatch: " << participantId;
|
||||
DEBUG_LOG() << "addParticipantToWatch: " << participantId;
|
||||
m_participantsToWatch += participantId;
|
||||
}
|
||||
|
||||
void Participant2Dds::removeParticipantToWatch(int participantId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "removeParticipantToWatch: " << participantId;
|
||||
DEBUG_LOG() << "removeParticipantToWatch: " << participantId;
|
||||
m_participantsToWatch -= participantId;
|
||||
}
|
||||
|
||||
@@ -121,7 +120,7 @@ void Participant2Dds::onParticipantChanged(const ParticipantManagement::Particip
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id()
|
||||
DEBUG_LOG() << "onParticipantChanged: " << data.id()
|
||||
<< ", " << m_participantsToWatch.contains(data.id())
|
||||
<< ", " << m_participantsToWatch.size()
|
||||
<< ", " << m_participantsToWatch.contains(data.id())
|
||||
@@ -138,18 +137,17 @@ void Participant2Dds::onParticipantChanged(const ParticipantManagement::Particip
|
||||
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainParticipant(), IDL::PartitionType::AllExercises))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- Start GuezNasat DDSHandler.";
|
||||
INFO_LOG() << "--- Start GuezNasat DDSHandler.";
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -160,22 +158,22 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
m_ddsDts = GuezNasat::Interface::Dts::create(m_ddsConnector);
|
||||
bool bRet = m_ddsDts->enableNasatAircraft() &&
|
||||
m_ddsDts->enableNasatAircraftParticipant();
|
||||
INFO_LOG(m_logger) << "Dts initialised: " << bRet;
|
||||
INFO_LOG() << "Dts initialised: " << bRet;
|
||||
|
||||
|
||||
m_ddsFts = GuezNasat::Interface::Fts::create(m_ddsConnector);
|
||||
bRet &= m_ddsFts->enableAll();
|
||||
INFO_LOG(m_logger) << "Fts initialised: " << bRet;
|
||||
INFO_LOG() << "Fts initialised: " << bRet;
|
||||
|
||||
|
||||
m_exmDtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
bRet &= m_exmDtc->enableExercise();
|
||||
INFO_LOG(m_logger) << "EXM Dtc initialised: " << bRet;
|
||||
INFO_LOG() << "EXM Dtc initialised: " << bRet;
|
||||
|
||||
|
||||
m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
bRet &= m_pdmDtc->enableChargeType();
|
||||
INFO_LOG(m_logger) << "PDM Dtc initialised: " << bRet;
|
||||
INFO_LOG() << "PDM Dtc initialised: " << bRet;
|
||||
|
||||
return bRet;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user