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/AlarmManagement/handler_participant.cpp
+12 -13
View File
@@ -14,7 +14,6 @@ using namespace AlarmManagement;
HandlerParticipant::HandlerParticipant(const std::shared_ptr<DdsHandler> &ddsHandler)
: QObject()
, m_ddsHandler(ddsHandler)
, m_logger(getLogger("HandlerParticipant"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -45,13 +44,13 @@ bool HandlerParticipant::init()
if (!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 (!dtcPpm->enableDynamicParticipantData())
{
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableDynamicParticipant data topic client";
ERROR_LOG() << "Could not initialize ParticipantManagement enableDynamicParticipant data topic client";
return false;
}
@@ -67,7 +66,7 @@ bool HandlerParticipant::init()
if (participant.equipmentNumber().is_set())
{
m_partId2EquipNoMap.insert(participant.id(), participant.equipmentNumber().get());
DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << participant.id() << "EquimentNo=" << participant.equipmentNumber().get();
DEBUG_LOG() << "m_partId2EquipNoMap.insert participantId=" << participant.id() << "EquimentNo=" << participant.equipmentNumber().get();
}
else
m_partId2EquipNoMap.insert(participant.id(), 0);
@@ -87,13 +86,13 @@ bool HandlerParticipant::init()
ParticipantManagement::StateInformation state = states[0];
int vulnerability = state.vulnerabilityState().underlying();
m_partId2VulnerabilityMap.insert(i.value().participantId(), vulnerability);
DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << i.value().participantId() << "vulnerability=" << vulnerability;
DEBUG_LOG() << "m_partId2EquipNoMap.insert participantId=" << i.value().participantId() << "vulnerability=" << vulnerability;
}
else
m_partId2VulnerabilityMap.insert(i.value().participantId(), -1);
}
INFO_LOG(m_logger) << "HandlerParticipant::init() finished. ";
INFO_LOG() << "HandlerParticipant::init() finished. ";
return true;
} // end of init()
//-----------------------------------------------------------------------------
@@ -102,12 +101,12 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
{
if (modType == DataModification::eRemoved)
{
DEBUG_LOG(m_logger) << "onParticipantChanged - remove: " << data.id();
DEBUG_LOG() << "onParticipantChanged - remove: " << data.id();
m_participantHierarchy.remove(data.id());
}
else
{
DEBUG_LOG(m_logger) << "onParticipantChanged:" << data;
DEBUG_LOG() << "onParticipantChanged:" << data;
m_participantHierarchy.insert(data.id(),
AlarmManagement::HandlerParticipant::ParticipantHierarchy(data));
const int equipNo = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
@@ -118,13 +117,13 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
void HandlerParticipant::onDynamicParticipantChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onDynamicParticipant participantId=" << data.participantId();
DEBUG_LOG() << "onDynamicParticipant participantId=" << data.participantId();
if (modType == DataModification::eRemoved)
{
}
else
{
INFO_LOG(m_logger) << "onDynamicParticipant()"
INFO_LOG() << "onDynamicParticipant()"
<< " participantId: " << data.participantId();
if (data.stateHistory().size() > 0)
{
@@ -132,7 +131,7 @@ void HandlerParticipant::onDynamicParticipantChanged(const ParticipantManagement
ParticipantManagement::StateInformation state = states[0];
int vulnerability = state.vulnerabilityState().underlying();
m_partId2VulnerabilityMap.insert(data.participantId(), vulnerability);
DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << data.participantId()
DEBUG_LOG() << "m_partId2EquipNoMap.insert participantId=" << data.participantId()
<< " vulnerability=" << vulnerability;
}
else
@@ -179,7 +178,7 @@ QVector<int> HandlerParticipant::getRecursiveInferiorIds(const int participantId
int HandlerParticipant::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()
@@ -187,7 +186,7 @@ int HandlerParticipant::participantId2EquipNo(const int participantId) const
int HandlerParticipant::participantId2Vulnerability(const int participantId) const
{
int ret = m_partId2VulnerabilityMap.value(participantId, 0);
INFO_LOG(m_logger) << "m_partId2VulnerabilityMap participantId=" << participantId
INFO_LOG() << "m_partId2VulnerabilityMap participantId=" << participantId
<< " Vulnerability=" << ret;
return ret;
} // end of participantId2Vulnerability()