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

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp
+93 -93
View File
@@ -179,12 +179,12 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
const int aesItemId = data.aesItemId();
const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
if ((data.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtDangerArea)
&& (data.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtBCContamination)
&& (data.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtNContamination))
if ((data.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtDangerArea)
&& (data.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtBCContamination)
&& (data.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtNContamination))
return;
if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType_def::AtBCContamination)
if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtBCContamination)
{
const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(data.aesItemId());
if (!bc.isCentral())
@@ -196,7 +196,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
upperOffset = bCContamination.upperOffset();
lowerOffset = bCContamination.lowerOffset();
}
else if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType_def::AtDangerArea)
else if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtDangerArea)
{
const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(data.aesItemId());
if (!da.isCentral())
@@ -205,7 +205,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
return;
}
}
else if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType_def::AtNContamination)
else if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtNContamination)
{
const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(data.aesItemId());
if (!nc.isCentral())
@@ -226,7 +226,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
switch (effectState.underlying())
{
case AreaEffectSimulation::AesEffectState_def::EsPrepared:
case AreaEffectSimulation::AesEffectState::EsPrepared:
{
const auto &aesItemViewUtm = CentralEffectSimulation::AesItemViewUtm::create(data,
m_aesItemViews[data.aesItemId()],
@@ -239,7 +239,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
}
break;
case AreaEffectSimulation::AesEffectState_def::EsActivated:
case AreaEffectSimulation::AesEffectState::EsActivated:
{
CentralEffectSimulation::AesItemViewUtm aesItemViewUtm =
@@ -262,8 +262,8 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
switch (data.aesTypeId().underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
case AreaEffectSimulation::AesType::AtNContamination:
// for each participant:
// Bounding-Box Check,
// form-Check
@@ -273,7 +273,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
// DEBUG_LOG(m_logger) << "insert AtBCContamination oder AtNContamination AesItemView id: " << aesItemId
// << ", type: " << data.aesTypeId();
break;
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType::AtDangerArea:
calculateDangerArea(aesItemViewUtm);
m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
DEBUG_LOG(m_logger) << "insert AtDangerArea AesItemView id: " << aesItemId
@@ -284,8 +284,8 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
} // switch aesTypeId
break;
} // case EsActivated
case AreaEffectSimulation::AesEffectState_def::EsRemoved:
case AreaEffectSimulation::AesEffectState_def::EsExpired:
case AreaEffectSimulation::AesEffectState::EsRemoved:
case AreaEffectSimulation::AesEffectState::EsExpired:
{
aesItemViewRemoved(aesItemId);
break;
@@ -314,10 +314,10 @@ void HandlerNBC::onBCContaminationChanged(const AreaEffectSimulation::BCContamin
case DataModification::eModified:
switch (data.effectStateId().underlying())
{
case AreaEffectSimulation::AesEffectState_def::EsActivated:
case AreaEffectSimulation::AesEffectState::EsActivated:
{
CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()];
if (m_ddsHandler->volatilityTypeId(data.chargeStruct()) == ProjectDataManagement::VolatilityType_def::Resident)
if (m_ddsHandler->volatilityTypeId(data.chargeStruct()) == ProjectDataManagement::VolatilityType::Resident)
{
ref.radials = {data.impactRadius()};
ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition(), &ref.zone);
@@ -345,7 +345,7 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat
case DataModification::eModified:
switch (data.effectStateId().underlying())
{
case AreaEffectSimulation::AesEffectState_def::EsActivated:
case AreaEffectSimulation::AesEffectState::EsActivated:
{
CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()];
ref.radials = {data.impactRadius(),
@@ -440,7 +440,7 @@ void HandlerNBC::deleteDangerArea(const int aesItemId)
const auto partPosMap = m_handlerParticipant->positions();
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
{
sendParticipantEvent(aesItemId, participantPos, ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
sendParticipantEvent(aesItemId, participantPos, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId();
}// for all Participants
} // deleteDangerArea
@@ -473,7 +473,7 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::
bool aesIsAvailable = m_ddsHandler->dtcAes()->aesItemViewFromEntityId(m_isInContaminatedRoom.value(participantData.participantId()),AreaEffectSimulation::AesType::AtUnknown, aesItemView );
if (aesIsAvailable
&& (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated))
&& (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated))
{
DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
m_isInContaminatedRoom.remove(participantData.participantId());
@@ -512,9 +512,9 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::
}
switch (itemView.aesTypeId.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType::AtBCContamination:
case AreaEffectSimulation::AesType::AtNContamination:
case AreaEffectSimulation::AesType::AtDangerArea:
inFormCheck(itemView, participantData);
break;
default:
@@ -569,7 +569,7 @@ void HandlerNBC::onRestoreRadioReadinessChanged(const int participantId)
bool HandlerNBC::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
{
if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated)
if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated)
return false;
// QRectF(topLeft, bottomRight) -> no need to mormalize, QRectF:contains() handles it correct
@@ -616,7 +616,7 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), zone);
switch (aesTypeId.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
{
// since buildings can only be contaminated by resident bccontaminations
// effectType is EffectType::BCContaminationEnterResident if isIndoor
@@ -626,16 +626,16 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
sendEffectTypeEvent(aesItemId, participantData, effectType);
break;
}
case AreaEffectSimulation::AesType_def::AtDangerArea:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::EnterDangerArea);
case AreaEffectSimulation::AesType::AtDangerArea:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_EnterDangerArea);
break;
case AreaEffectSimulation::AesType_def::AtNContamination:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::EnterNuclear);
case AreaEffectSimulation::AesType::AtNContamination:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_EnterNuclear);
sendEffectTypeEvent(aesItemId, participantData, effectTypeForNContaminationArea(m_aesItemViews.value(aesItemId), participantPosUtmPoint, participantData.sampleTime(), participantData.insideBuilding()));
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtMineArea:
default:
INFO_LOG(m_logger) << "sendEvent Unhandled AES-Type" << aesTypeId;
break;
@@ -646,7 +646,7 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati
{
AreaEffectSimulation::AesItemView aesItemView;
m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId, AreaEffectSimulation::AesType_def::AtUnknown, aesItemView);
m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId, AreaEffectSimulation::AesType::AtUnknown, aesItemView);
DEBUG_LOG(m_logger) << "sendLeaveEvent"
<< " aesId=" << aesItemId
@@ -656,21 +656,21 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati
switch (aesItemView.aesTypeId().underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
sendEffectTypeEvent(aesItemId, participantData, EffectType::BCContaminationLeave);
break;
case AreaEffectSimulation::AesType_def::AtDangerArea:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
case AreaEffectSimulation::AesType::AtDangerArea:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
break;
case AreaEffectSimulation::AesType_def::AtMineArea:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::LeaveMineArea);
case AreaEffectSimulation::AesType::AtMineArea:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_LeaveMineArea);
break;
case AreaEffectSimulation::AesType_def::AtNContamination:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::LeaveNuclear);
case AreaEffectSimulation::AesType::AtNContamination:
sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_LeaveNuclear);
sendEffectTypeEvent(aesItemId, participantData, EffectType::NContaminationLeave);
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
default:
break;
} // end switch
@@ -681,7 +681,7 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati
bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &itemView,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
{
if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated)
if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated)
return false;
const QRectF boundingBoxImpact(itemView.boundingBoxBottomLeft,
@@ -715,7 +715,7 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
<< " roomFound=" << roomFound
<< " offsetZ=" << structureElement.relPosition().offsetZ();
if ( (itemView.aesTypeId.underlying() != AreaEffectSimulation::AesType_def::AtNContamination)
if ( (itemView.aesTypeId.underlying() != AreaEffectSimulation::AesType::AtNContamination)
&& itemView.offsetIsSet
&& ( ( structureElement.relPosition().offsetZ() + 1.5 > itemView.upperOffset )
|| ( structureElement.relPosition().offsetZ() + 1.5 < itemView.lowerOffset)))
@@ -779,12 +779,12 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm
int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0);
const TrainingAreaBase::TabPosition pos(participantData.pos(),
Core::PositionReportingSource_def::Gps, // irrelevant
Core::PositionReportingSource::Gps, // irrelevant
participantData.buildingId(),
participantData.roomId());
const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
TrainingAreaBase::SendCesHitRequest requestTab(
equipNo, // equipmentNumber
participantData.participantId(), // participantId
@@ -878,10 +878,10 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
int32_t originatorParticipantId = m_aesItemId2partIdMap.value(aesItemId, 0);
const int originatorEquipmentNumber = m_ddsHandler->participantId2EquipNo(originatorParticipantId);
const TrainingAreaBase::TabPosition pos(
participantData.pos(), Core::PositionReportingSource_def::Gps, participantData.buildingId(),
participantData.pos(), Core::PositionReportingSource::Gps, participantData.buildingId(),
participantData.roomId()
);
const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
TrainingAreaBase::SendCesHitRequest requestTab(
equipmentNumber, participantData.participantId(), legacyChargeTypeId, aesItemId, originatorEquipmentNumber,
remaining, pos, effectTime, eventType, partyId, mineFieldBitIndex
@@ -903,12 +903,12 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
{
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId());
// can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar)
if (typeClass == ParticipantManagement::TypeClass_def::Unit ||
typeClass == ParticipantManagement::TypeClass_def::SupportUnit ||
typeClass == ParticipantManagement::TypeClass_def::SupportEntity ||
typeClass == ParticipantManagement::TypeClass_def::Aircraft ||
typeClass == ParticipantManagement::TypeClass_def::Vessel ||
typeClass == ParticipantManagement::TypeClass_def::Unknown)
if (typeClass == ParticipantManagement::TypeClass::Unit ||
typeClass == ParticipantManagement::TypeClass::SupportUnit ||
typeClass == ParticipantManagement::TypeClass::SupportEntity ||
typeClass == ParticipantManagement::TypeClass::Aircraft ||
typeClass == ParticipantManagement::TypeClass::Vessel ||
typeClass == ParticipantManagement::TypeClass::Unknown)
{
DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId()
<< " has invalid typeClass: " << typeClass
@@ -931,12 +931,12 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
}
// send hit events only with central AES Simulation
if (eventType == ProjectDataManagement::PdmEventType_def::HitB
|| eventType == ProjectDataManagement::PdmEventType_def::HitC
|| eventType == ProjectDataManagement::PdmEventType_def::Hit
|| eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation
|| eventType == ProjectDataManagement::PdmEventType_def::HitMine
|| eventType == ProjectDataManagement::PdmEventType_def::HitN)
if (eventType == ProjectDataManagement::PdmEventType::EventType_HitB
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitC
|| eventType == ProjectDataManagement::PdmEventType::EventType_Hit
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitMine
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitN)
{
DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantData.participantId();
return;
@@ -963,17 +963,17 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
pe.aesItemId(aesItemId);
pe.partyId(participantData.partyId());
if (eventType == ProjectDataManagement::PdmEventType_def::BCContamination)
if (eventType == ProjectDataManagement::PdmEventType::EventType_BCContamination)
{
const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(aesItemId);
pe.aesName(bc.name());
}
else if (eventType == ProjectDataManagement::PdmEventType_def::DangerArea)
else if (eventType == ProjectDataManagement::PdmEventType::EventType_DangerArea)
{
const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(aesItemId);
pe.aesName(da.name());
}
else if (eventType == ProjectDataManagement::PdmEventType_def::NContamination)
else if (eventType == ProjectDataManagement::PdmEventType::EventType_NContamination)
{
const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(aesItemId);
pe.aesName(nc.name());
@@ -988,14 +988,14 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
// Criterion for friendly Fire:
if (aesItem.partyId() != -1
&& ((eventType == ProjectDataManagement::PdmEventType_def::EnterMineArea
|| eventType == ProjectDataManagement::PdmEventType_def::EnterNuclear
|| eventType == ProjectDataManagement::PdmEventType_def::HitB
|| eventType == ProjectDataManagement::PdmEventType_def::HitC
|| eventType == ProjectDataManagement::PdmEventType_def::Hit
|| eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation
|| eventType == ProjectDataManagement::PdmEventType_def::HitMine
|| eventType == ProjectDataManagement::PdmEventType_def::HitN)
&& ((eventType == ProjectDataManagement::PdmEventType::EventType_EnterMineArea
|| eventType == ProjectDataManagement::PdmEventType::EventType_EnterNuclear
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitB
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitC
|| eventType == ProjectDataManagement::PdmEventType::EventType_Hit
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitMine
|| eventType == ProjectDataManagement::PdmEventType::EventType_HitN)
&& aesItem.partyId() == participantData.partyId()))
pe.friendlyFire(true);
else
@@ -1060,26 +1060,26 @@ bool HandlerNBC::eventMustBeSend(int aesItemId,
// - remove opposite events (e.g remove Enter event when we leave the area)
switch (eventType.underlying())
{
case ProjectDataManagement::PdmEventType_def::EnterDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
break;
case ProjectDataManagement::PdmEventType_def::LeaveDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterDangerArea);
case ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea);
break;
case ProjectDataManagement::PdmEventType_def::EnterMineArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveMineArea);
case ProjectDataManagement::PdmEventType::EventType_EnterMineArea:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea);
break;
case ProjectDataManagement::PdmEventType_def::LeaveMineArea:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterMineArea);
case ProjectDataManagement::PdmEventType::EventType_LeaveMineArea:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterMineArea);
break;
case ProjectDataManagement::PdmEventType_def::EnterNuclear:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveNuclear);
case ProjectDataManagement::PdmEventType::EventType_EnterNuclear:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear);
break;
case ProjectDataManagement::PdmEventType_def::LeaveNuclear:
activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterNuclear);
case ProjectDataManagement::PdmEventType::EventType_LeaveNuclear:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterNuclear);
break;
case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea:
case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea:
case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea:
case ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea:
default:
break;
}
@@ -1200,25 +1200,25 @@ ProjectDataManagement::PdmEventType HandlerNBC::leaveEventTypeForAesType(AreaEff
{
switch (aesTypeId.underlying())
{
case AreaEffectSimulation::AesType_def::AtDangerArea:
return ProjectDataManagement::PdmEventType::LeaveDangerArea;
case AreaEffectSimulation::AesType_def::AtMineArea:
return ProjectDataManagement::PdmEventType::LeaveMineArea;
case AreaEffectSimulation::AesType_def::AtNContamination:
return ProjectDataManagement::PdmEventType::LeaveNuclear;
case AreaEffectSimulation::AesType::AtDangerArea:
return ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea;
case AreaEffectSimulation::AesType::AtMineArea:
return ProjectDataManagement::PdmEventType::EventType_LeaveMineArea;
case AreaEffectSimulation::AesType::AtNContamination:
return ProjectDataManagement::PdmEventType::EventType_LeaveNuclear;
default:
break;
}
return ProjectDataManagement::PdmEventType::Unknown;
return ProjectDataManagement::PdmEventType::EventType_Unknown;
}
EffectType HandlerNBC::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
{
switch (aesTypeId.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
return EffectType::BCContaminationLeave;
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
return EffectType::NContaminationLeave;
default:
break;
@@ -1329,7 +1329,7 @@ void HandlerNBC::aesItemViewRemoved(int aesItemId)
}
}
const auto eventTypeLeave = leaveEventTypeForAesType(aiv.aesTypeId);
if (eventTypeLeave != ProjectDataManagement::PdmEventType::Unknown)
if (eventTypeLeave != ProjectDataManagement::PdmEventType::EventType_Unknown)
{
DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave;
auto it = m_eventStates.find(aesItemId);