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/ExerciseEventManagement/handler_participant_event.cpp
+20 -21
View File
@@ -27,7 +27,6 @@ HandlerParticipantEvent::HandlerParticipantEvent(MainHandler *mainHandler,
, m_dbHandler(db)
, m_eventServer(eventServer)
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerParticipantEvent"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -39,13 +38,13 @@ HandlerParticipantEvent::~HandlerParticipantEvent()
bool HandlerParticipantEvent::init()
{
INFO_LOG(m_logger) << "start init() DTC CentralEffectSimulation ";
INFO_LOG() << "start init() DTC CentralEffectSimulation ";
// DTC CentralEffectSimulation
m_cesDtc = CentralEffectSimulation::Interface::Dtc::create(m_ddsHandler->ddsConnector());
if (!m_cesDtc)
{
ERROR_LOG(m_logger) << "Could not create DTC CentralEffectSimulation";
ERROR_LOG() << "Could not create DTC CentralEffectSimulation";
return false;
}
@@ -55,7 +54,7 @@ bool HandlerParticipantEvent::init()
if (!m_cesDtc->enableParticipantEvent() )
{
ERROR_LOG(m_logger) << "init() DTC CentralEffectSimulation failed";
ERROR_LOG() << "init() DTC CentralEffectSimulation failed";
return false;
}
@@ -63,7 +62,7 @@ bool HandlerParticipantEvent::init()
m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
if (!m_pdmDtc)
{
ERROR_LOG(m_logger) << "Could not create DTC ProjectDataManagement";
ERROR_LOG() << "Could not create DTC ProjectDataManagement";
return false;
}
m_pdmDtc->enableChargeType();
@@ -85,7 +84,7 @@ bool HandlerParticipantEvent::init()
void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
DEBUG_LOG() << "AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
Database::EemEvent eData = m_aesMap[data.id()];
eData.sampleTime = data.effectStart();
@@ -97,7 +96,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
{
case DataModification::eAdded:
m_itemViews.insert(data.aesItemId(), data.aesTypeId());
DEBUG_LOG(m_logger) << "eAdded: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
DEBUG_LOG() << "eAdded: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
m_aesEffectState.insert(data.aesItemId(), data.effectStateId());
if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBorderline)
@@ -116,7 +115,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
data.boundingBoxBottomLeft().lat(), 0.0);
if (!m_dbHandler->db()->insert(eData))
ERROR_LOG(m_logger) << "Error while inserting event data from AES ";
ERROR_LOG() << "Error while inserting event data from AES ";
else
publishData(eData);
}
@@ -125,22 +124,22 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
{
AreaEffectSimulation::AesEffectState effectState = m_aesEffectState.value(data.aesItemId());
DEBUG_LOG(m_logger) << "eModified: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
DEBUG_LOG(m_logger) << "effectState: " << effectState;
DEBUG_LOG() << "eModified: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
DEBUG_LOG() << "effectState: " << effectState;
// insert event only once
if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared &&
(effectState == AreaEffectSimulation::AesEffectState_def::EsActivated && data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsExpired))
return;
INFO_LOG(m_logger) << "new/update event: aesId: " << data.aesItemId();
INFO_LOG() << "new/update event: aesId: " << data.aesItemId();
m_aesEffectState.insert(data.aesItemId(), data.effectStateId());
m_itemViews.insert(data.aesItemId(), data.aesTypeId());
eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft().lon(),
data.boundingBoxBottomLeft().lat(), 0.0);
INFO_LOG(m_logger) << "aesType: " << data.aesTypeId();
INFO_LOG() << "aesType: " << data.aesTypeId();
switch (data.aesTypeId().underlying())
{
@@ -182,7 +181,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
// No ExerciseEvent for AesType
default:
{
INFO_LOG(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId().underlying();
INFO_LOG() << "No ExerciseEvent for AesType:" << data.aesTypeId().underlying();
return;
}
}
@@ -213,7 +212,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
{
if (!m_dbHandler->db()->insert(eData))
{
ERROR_LOG(m_logger) << "Error while inserting event data from AES ";
ERROR_LOG() << "Error while inserting event data from AES ";
break;
}
m_aesMap.insert(data.id(), eData);
@@ -222,7 +221,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
{
if (!m_dbHandler->db()->update(eData))
{
ERROR_LOG(m_logger) << "Error while updating event data from AES ";
ERROR_LOG() << "Error while updating event data from AES ";
break;
}
}
@@ -291,7 +290,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
{
if (!m_dbHandler->db()->insert(eData))
{
ERROR_LOG(m_logger) << "Error while inserting event data from AES ";
ERROR_LOG() << "Error while inserting event data from AES ";
break;
}
m_aesMap.insert(data.id(), eData);
@@ -300,7 +299,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
{
if (!m_dbHandler->db()->update(eData))
{
ERROR_LOG(m_logger) << "Error while updating event data from AES ";
ERROR_LOG() << "Error while updating event data from AES ";
break;
}
}
@@ -308,7 +307,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
break;
}
default:
DEBUG_LOG(m_logger) << "Nothing to do";
DEBUG_LOG() << "Nothing to do";
}
}
//-----------------------------------------------------------------------------
@@ -324,7 +323,7 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
eData.partyId = data.partyId();
eData.sampleTime = data.eventTime();
eData.position = LtsUtils::QPoint3D(data.position().lon(), data.position().lat(), data.position().z());
DEBUG_LOG(m_logger) << " onParticipantEventChanged "
DEBUG_LOG() << " onParticipantEventChanged "
<< " position=" << data.position()
<< " eData.position=" << eData.position;
@@ -398,7 +397,7 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
if (!m_dbHandler->db()->insert(eData))
ERROR_LOG(m_logger) << "Error while inserting event data from CES ";
ERROR_LOG() << "Error while inserting event data from CES ";
else
publishData(eData);
@@ -413,7 +412,7 @@ void HandlerParticipantEvent::publishData(const Database::EemEvent &data)
ExerciseEventManagement::Event ddsData = toDdsData(data);
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG(m_logger) << "Error publishing event-data to dds";
ERROR_LOG() << "Error publishing event-data to dds";
// take data from dds-bus after 10s, we need just to make sure the recording service got it
m_mainHandler->addEventIdToRemove(ddsData.id());