lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6/rtiddsgen migration of residual Lts service sources

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-25 20:23:37 +02:00
1 parent e748e82c84
commit a410019553
86 files changed
+1235 -1128
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
+48 -48
View File
@@ -100,7 +100,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
DEBUG_LOG(m_logger) << "eAdded: AesItemId: " << data.aesItemId << ", effectState: " << data.effectStateId;
m_aesEffectState.insert(data.aesItemId, data.effectStateId);
if (data.aesTypeId == AreaEffectSimulation::AesType::AesType_AtBorderline)
if (data.aesTypeId == AreaEffectSimulation::AesType::AtBorderline)
{
AreaEffectSimulation::AesItem aesItem;
m_aesDtc->aesItemFromId(data.aesItemId, aesItem);
@@ -108,7 +108,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
QJsonObject obj;
obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id);
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId.underlying());
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(data.aesTypeId));
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Borderline;
@@ -130,7 +130,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
// insert event only once
if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared &&
(effectState == AreaEffectSimulation::AesEffectState::AesEffectState_EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::AesEffectState_EsExpired))
(effectState == AreaEffectSimulation::AesEffectState::EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::EsExpired))
return;
INFO_LOG(m_logger) << "new/update event: aesId: " << data.aesItemId;
@@ -142,7 +142,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
INFO_LOG(m_logger) << "aesType: " << data.aesTypeId;
switch (data.aesTypeId.underlying())
switch (data.aesTypeId)
{
case AreaEffectSimulation::AesType::AtMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_MineArea;
@@ -182,7 +182,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(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId;
return;
}
}
@@ -200,12 +200,12 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
QJsonObject obj;
obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id);
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId.underlying());
if (data.aesTypeId.underlying() != AreaEffectSimulation::AesType::AtBorderline)
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(data.aesTypeId));
if (data.aesTypeId != AreaEffectSimulation::AesType::AtBorderline)
{
obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration);
obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct.chargeTypeId);
obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart + aesItem.effectDuration);
obj[QStringLiteral("endTime")] = QJsonValue(static_cast<qint64>(data.effectStart + aesItem.effectDuration));
}
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
@@ -263,7 +263,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
// insert event only once
if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared &&
(effectState == AreaEffectSimulation::AesEffectState::AesEffectState_EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::AesEffectState_EsExpired))
(effectState == AreaEffectSimulation::AesEffectState::EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::EsExpired))
return;
m_aesEffectState.insert(data.id, data.effectStateId);
@@ -277,10 +277,10 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
QJsonObject obj;
obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id);
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name));
obj[QStringLiteral("AesType")] = QJsonValue(AreaEffectSimulation::AesType::AtExplosionSingle);
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(AreaEffectSimulation::AesType::AtExplosionSingle));
obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct.chargeTypeId);
obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration);
obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart.get() + aesItem.effectDuration);
obj[QStringLiteral("endTime")] = QJsonValue(static_cast<qint64>(data.effectStart.get() + aesItem.effectDuration));
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
//const Core::GeoPosition geoPosition ( data.impactPosition().lon(), data.impactPosition().lat(), 0);
@@ -328,68 +328,68 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
<< " position=" << data.position
<< " eData.position=" << eData.position;
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Unknown;
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Unknown;
QJsonObject obj;
obj[QStringLiteral("AesId")] = QJsonValue(data.aesItemId);
obj[QStringLiteral("AesType")] = QJsonValue(m_itemViews.value(data.aesItemId).underlying());
obj[QStringLiteral("AesType")] = QJsonValue(static_cast<int>(m_itemViews.value(data.aesItemId)));
obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(data.aesName));
obj[QStringLiteral("FriendlyFire")] = QJsonValue(data.friendlyFire);
switch(data.eventTypeId.underlying())
switch(data.eventTypeId)
{
case ProjectDataManagement::PdmEventType::PdmEventType_HitEffectSimulation:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitEffectSimulation;
case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_HitMine:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitMine;
case ProjectDataManagement::PdmEventType::EventType_HitMine:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitMine;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_HitN:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitN;
case ProjectDataManagement::PdmEventType::EventType_HitN:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitN;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_HitC:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitC;
case ProjectDataManagement::PdmEventType::EventType_HitC:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitC;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_EnterDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterDangerArea;
case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveDangerArea;
case ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_EnterMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterMineArea;
case ProjectDataManagement::PdmEventType::EventType_EnterMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterMineArea;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveMineArea;
case ProjectDataManagement::PdmEventType::EventType_LeaveMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_EnterNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterNuclear;
case ProjectDataManagement::PdmEventType::EventType_EnterNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterNuclear;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveNuclear;
case ProjectDataManagement::PdmEventType::EventType_LeaveNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveNuclear;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_CrossLocalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_CrossLocalBorderline;
case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline;
obj[QStringLiteral("Global")] = QJsonValue(false);
break;
case ProjectDataManagement::PdmEventType::PdmEventType_CrossGlobalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_CrossGlobalBorderline;
case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline;
obj[QStringLiteral("Global")] = QJsonValue(true);
break;
case ProjectDataManagement::PdmEventType::PdmEventType_EnterFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterFunctionalArea;
case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveFunctionalArea;
case ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_EnterHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterHazardDistance;
case ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_LeaveHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveHazardDistance;
case ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance;
break;
case ProjectDataManagement::PdmEventType::PdmEventType_AirSupport:
eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_AirSupport;
case ProjectDataManagement::PdmEventType::EventType_AirSupport:
eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport;
break;
default:
return;