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
@@ -16,18 +16,17 @@ namespace EffectShowManagement
|
||||
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(ddsConnector)
|
||||
, 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) << "--- StartEffectShowManagement DDSHandler.";
|
||||
INFO_LOG() << "--- StartEffectShowManagement DDSHandler.";
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -45,13 +44,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_ddsDts->enableAll())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not Dts enableAll";
|
||||
ERROR_LOG() << "Could not Dts enableAll";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsFts->enableAll())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not Fts enableAll";
|
||||
ERROR_LOG() << "Could not Fts enableAll";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,18 +58,18 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
m_dtcAes = AreaEffectSimulation::Interface::Dtc::create(m_ddsConnector);
|
||||
if (!m_dtcAes->enableExplosionArea())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize enableExplosionArea data topic client";
|
||||
ERROR_LOG() << "Could not initialize enableExplosionArea data topic client";
|
||||
return false;
|
||||
}
|
||||
if (!m_dtcAes->enableExplosionSingle())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize enableExplosionArea data topic client";
|
||||
ERROR_LOG() << "Could not initialize enableExplosionArea data topic client";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_dtcAes->enableMineArea())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize enableMineArea data topic client";
|
||||
ERROR_LOG() << "Could not initialize enableMineArea data topic client";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -79,7 +78,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
m_ftcAes = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
|
||||
if (!m_ftcAes->enableSetAesItemEffectorState(true))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize enableSetAesItemEffectorState data topic client";
|
||||
ERROR_LOG() << "Could not initialize enableSetAesItemEffectorState data topic client";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -88,13 +87,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_dtcPpm->enableParticipant())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize Participant data topic client";
|
||||
ERROR_LOG() << "Could not initialize Participant data topic client";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_dtcPpm->enableType())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize Participant type data topic client";
|
||||
ERROR_LOG() << "Could not initialize Participant type data topic client";
|
||||
return false;
|
||||
}
|
||||
m_dtcPpm->waitForHistoricalDataType();
|
||||
@@ -104,7 +103,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_dtcPdm->enableChargeType())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing ProjectDataManagement DTC";
|
||||
ERROR_LOG() << "Error initializing ProjectDataManagement DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -113,7 +112,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_dtcMdm->enableMeteoData())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing MeteoDataManagement DTC";
|
||||
ERROR_LOG() << "Error initializing MeteoDataManagement DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -122,19 +121,19 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_dtcTab->enableFireSmokeMarkerData())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase DTC";
|
||||
ERROR_LOG() << "Error initializing TrainingAreaBase DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
|
||||
if (!m_ftcTab->enableSendFireSmokeMarkerData())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
|
||||
ERROR_LOG() << "Error initializing TrainingAreaBase FTC";
|
||||
return false;
|
||||
}
|
||||
if (!m_ftcTab->enableAdlerFqFb())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
|
||||
ERROR_LOG() << "Error initializing TrainingAreaBase FTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user