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

@@ -16,16 +16,15 @@ namespace TargetManagement
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
, 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)
{
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
ERROR_LOG() << "Error initializing dds connections - aborting";
return false;
}
@@ -44,18 +43,18 @@ bool DdsHandler::init(const QStringList &qosFileList)
// DTS Target
m_dtsTgt = TargetManagement::Interface::Dts::create(m_ddsConnector);
bool bRet = m_dtsTgt->enableAll();
INFO_LOG(m_logger) << "Dts initialised";
INFO_LOG() << "Dts initialised";
// FTS Target
m_ftsTgt = TargetManagement::Interface::Fts::create(m_ddsConnector);
bRet &= m_ftsTgt->enableAll();
INFO_LOG(m_logger) << "Fts initialised";
INFO_LOG() << "Fts initialised";
// DTC TrainingAreaBase
m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
if (!m_dtcTab->enableTargetData())
{
ERROR_LOG(m_logger) << "Could not enable receive TAB";
ERROR_LOG() << "Could not enable receive TAB";
return false;
}
@@ -63,7 +62,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
if (!m_ftcTab->enableSendTargetData())
{
ERROR_LOG(m_logger) << "Could not enable Send TAB";
ERROR_LOG() << "Could not enable Send TAB";
return false;
}
@@ -76,7 +75,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_dtcPpm->enableEquipmentType()
))
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableXXX data topic client";
ERROR_LOG() << "Could not initialize ParticipantManagement enableXXX data topic client";
return false;
}
// Get 'static' data for all participants (playerdata)
@@ -104,7 +103,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
int DdsHandler::participantId2EquipNo(const int participantId) const
{
int ret = m_partId2EquipNoMap.value(participantId, 0);
INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
INFO_LOG() << "participantId2EquipNo participantId=" << participantId
<< " EquipmentNumber=" << ret;
return ret;
} // end of participantId2EquipNo()
@@ -112,7 +111,7 @@ int DdsHandler::participantId2EquipNo(const int participantId) const
int DdsHandler::equipNo2participantId(const int equipmentNumber) const
{
int ret = m_equipNo2partIdMap.value(equipmentNumber, 0);
INFO_LOG(m_logger) << "EquipNo2participantId equipmentNumber=" << equipmentNumber
INFO_LOG() << "EquipNo2participantId equipmentNumber=" << equipmentNumber
<< " ParticipantId=" << ret;
return ret;
} // end of EquipNo2participantId()
@@ -122,7 +121,7 @@ int DdsHandler::equipNo2participantId(const int equipmentNumber) const
// ///////////////////////////////////
void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onParticipantChanged";
DEBUG_LOG() << "onParticipantChanged";
if (modType == DataModification::eRemoved)
m_partId2EquipNoMap.remove(data.id());
else
@@ -136,7 +135,7 @@ void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &
{
for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
{
TRACE_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
TRACE_LOG() << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
<< " partId: " << i.key()
<< " eqNo: " << i.value();
}