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/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
+114 -114
View File
@@ -647,8 +647,8 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data)
const QList<rpr2::IPlayerEnvironmentObjectObjInstance *> icbs = m_environmentObjects.values(data.id());
if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
{
for (rpr2::IPlayerEnvironmentObjectObjInstance *item : icbs)
item->deleteObjectInstance(ngs::SimTime(true));
@@ -657,11 +657,11 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data)
return true;
}
if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived)
if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived)
return false;
QVector<rpr2::IPlayerGuezMineFieldObjInstance *> minefields;
@@ -705,9 +705,9 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data)
const AreaEffectSimulation::MineSegment &segment = data.segments()[i];
icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated);
if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated);
if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved)
icb->setPercentComplete(100);
else
icb->setPercentComplete(0);
@@ -739,8 +739,8 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor
const QList<rpr2::IPlayerEnvironmentObjectObjInstance *> icbs = m_environmentObjects.values(data.id());
if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
{
for (rpr2::IPlayerEnvironmentObjectObjInstance *item : icbs)
item->deleteObjectInstance(ngs::SimTime(true));
@@ -749,11 +749,11 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor
return true;
}
if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused)
if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused)
return false;
QMap<int, rpr2::IPlayerGuezMineFieldBreachObjInstance *> map;
@@ -799,9 +799,9 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor
icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name()));
icb->setPointsData(positionArray(mineCorridorSegment(data.segments().at(i), data.segments().at(i + 1), data.width())));
icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated);
if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated);
if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved)
icb->setPercentComplete(100);
else
icb->setPercentComplete(0);
@@ -827,8 +827,8 @@ bool NgsConnector::guezNuclearAgent(const AreaEffectSimulation::NContamination &
if (icb &&
(data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved))
(data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved))
{
icb->deleteObjectInstance(ngs::SimTime(true));
m_environmentObjects.remove(data.id());
@@ -836,11 +836,11 @@ bool NgsConnector::guezNuclearAgent(const AreaEffectSimulation::NContamination &
return true;
}
if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused)
if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused)
return false;
if (!icb)
@@ -881,8 +881,8 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination
if (icb &&
(data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved))
(data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved))
{
icb->deleteObjectInstance(ngs::SimTime(true));
m_environmentObjects.remove(data.id());
@@ -890,11 +890,11 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination
return true;
}
if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused)
if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated &&
data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused)
return false;
if (!icb)
@@ -922,13 +922,13 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination
}
is.setEntityNumber(10 * data.id());
icb->setObjectIdentifier(is.toEIS());
icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated);
icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated);
icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0));
icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name()));
icb->setDuration(data.effectDuration() / 1000 / 60);
icb->setDetonationLocation(pos.toWorldLocation());
if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsExpired ||
data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired ||
data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved)
icb->setPercentComplete(100);
else
icb->setPercentComplete(0);
@@ -961,26 +961,26 @@ bool NgsConnector::setItemForm(int aesItemId, int aesTypeId, const std::vector<C
std::vector<Core::GeoPosition> reducedForm;
switch (aesTypeId)
{
case AesType_def::AtBCContamination:
case AesType::AtBCContamination:
reducedForm = bcReduction(form);
break;
case AesType_def::AtMineCorridor:
case AesType_def::AtExplosionArea:
case AesType_def::AtExplosionSingle:
case AesType_def::AtMineArea:
case AesType_def::AtNContamination:
case AesType::AtMineCorridor:
case AesType::AtExplosionArea:
case AesType::AtExplosionSingle:
case AesType::AtMineArea:
case AesType::AtNContamination:
return true;
case AesType_def::AtUnknown:
case AesType_def::AtDangerArea:
case AesType_def::AtFunctionalArea:
case AesType_def::AtBorderline:
case AesType_def::AtTechnicalArea:
case AesType_def::AtReconArea:
case AesType_def::AtDusSingleMine:
case AesType_def::AtExplosionAreaSingleExplosions:
case AesType_def::AtMineAreaSingleMines:
case AesType_def::AtGasPipe:
case AesType::AtUnknown:
case AesType::AtDangerArea:
case AesType::AtFunctionalArea:
case AesType::AtBorderline:
case AesType::AtTechnicalArea:
case AesType::AtReconArea:
case AesType::AtDusSingleMine:
case AesType::AtExplosionAreaSingleExplosions:
case AesType::AtMineAreaSingleMines:
case AesType::AtGasPipe:
return true;
}
@@ -1577,33 +1577,33 @@ rpr2::HitResultEnum16::ET NgsConnector::getHitResultEnum(const ProjectDataManage
{
switch (ts.underlying())
{
case ProjectDataManagement::VulnerabilityState_def::CombatReady:
case ProjectDataManagement::VulnerabilityState::CombatReady:
return rpr2::HitResultEnum16::Reset;
case ProjectDataManagement::VulnerabilityState_def::LightDamage:
case ProjectDataManagement::VulnerabilityState::LightDamage:
return rpr2::HitResultEnum16::LightDamage;
case ProjectDataManagement::VulnerabilityState_def::MediumDamage:
case ProjectDataManagement::VulnerabilityState::MediumDamage:
return rpr2::HitResultEnum16::MediumDamage;
case ProjectDataManagement::VulnerabilityState_def::HeavyDamage:
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
return rpr2::HitResultEnum16::HeavyDamage;
case ProjectDataManagement::VulnerabilityState_def::MobilityKill:
case ProjectDataManagement::VulnerabilityState::MobilityKill:
return rpr2::HitResultEnum16::MobilityKill;
case ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill:
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
return rpr2::HitResultEnum16::MobilityKillVisible;
case ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
return rpr2::HitResultEnum16::WeaponDamage;
case ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
return rpr2::HitResultEnum16::WeaponDamageVisible;
case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill:
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
return rpr2::HitResultEnum16::TotalKill;
case ProjectDataManagement::VulnerabilityState_def::TemporarySeverance:
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
return rpr2::HitResultEnum16::TemporaryFailure;
case ProjectDataManagement::VulnerabilityState_def::NearMiss:
case ProjectDataManagement::VulnerabilityState::NearMiss:
return rpr2::HitResultEnum16::NearMiss;
case ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect:
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
return rpr2::HitResultEnum16::HitWithNoEffect;
case ProjectDataManagement::VulnerabilityState_def::NContamination:
case ProjectDataManagement::VulnerabilityState_def::BContamination:
case ProjectDataManagement::VulnerabilityState_def::CContamination:
case ProjectDataManagement::VulnerabilityState::NContamination:
case ProjectDataManagement::VulnerabilityState::BContamination:
case ProjectDataManagement::VulnerabilityState::CContamination:
return rpr2::HitResultEnum16::Contaminated;
default:
return rpr2::HitResultEnum16::Reset;
@@ -1616,37 +1616,37 @@ ProjectDataManagement::VulnerabilityState NgsConnector::getTacticalStatusEnum(co
switch (hr)
{
case rpr2::HitResultEnum16::Reset:
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
case rpr2::HitResultEnum16::LightDamage:
return ProjectDataManagement::VulnerabilityState_def::LightDamage;
return ProjectDataManagement::VulnerabilityState::LightDamage;
case rpr2::HitResultEnum16::MediumDamage:
return ProjectDataManagement::VulnerabilityState_def::MediumDamage;
return ProjectDataManagement::VulnerabilityState::MediumDamage;
case rpr2::HitResultEnum16::HeavyDamage:
return ProjectDataManagement::VulnerabilityState_def::HeavyDamage;
return ProjectDataManagement::VulnerabilityState::HeavyDamage;
case rpr2::HitResultEnum16::MobilityKill:
return ProjectDataManagement::VulnerabilityState_def::MobilityKill;
return ProjectDataManagement::VulnerabilityState::MobilityKill;
case rpr2::HitResultEnum16::MobilityKillVisible:
return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill;
return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
case rpr2::HitResultEnum16::WeaponDamage:
return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage;
return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
case rpr2::HitResultEnum16::WeaponDamageVisible:
return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage;
return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
case rpr2::HitResultEnum16::TotalKill:
return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill;
return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
case rpr2::HitResultEnum16::CheatingKill:
return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill;
return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
case rpr2::HitResultEnum16::NearMiss:
return ProjectDataManagement::VulnerabilityState_def::NearMiss;
return ProjectDataManagement::VulnerabilityState::NearMiss;
case rpr2::HitResultEnum16::HitWithNoEffect:
return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect;
return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
case rpr2::HitResultEnum16::Contaminated:
return ProjectDataManagement::VulnerabilityState_def::CContamination;
return ProjectDataManagement::VulnerabilityState::CContamination;
case rpr2::HitResultEnum16::TemporaryFailure:
return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance;
return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
default:
return ProjectDataManagement::VulnerabilityState_def::NoChange;
return ProjectDataManagement::VulnerabilityState::NoChange;
}
return ProjectDataManagement::VulnerabilityState_def::NoChange;
return ProjectDataManagement::VulnerabilityState::NoChange;
}
QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::UtmCoordinate &base)
@@ -1681,10 +1681,10 @@ void NgsConnector::onEntityIdentifierChanged(const rpr2::EntityIdentifierStruct
GuezHitStruct hs;
hs.originatorType = ProjectDataManagement::StateChangeOriginator_def::Initialization;
hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
hs.targetId = is.entityNumber();
hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged;
hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged;
QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj]() mutable
{
@@ -2083,11 +2083,11 @@ bool NgsConnector::onTacticalStatusChanged(const rpr2::EntityIdentifierStruct &e
GuezHitStruct hitStruct;
hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString();
hitStruct.originatorId = 0;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition();
hitStruct.sampleTime = simTimeMSecs;
hitStruct.targetId = is.entityNumber();
hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged;
hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged;
hitStruct.vulnerabilityKind = 0;
const auto vulnerabilityBits = m_damageModelMap[is.entityNumber()]->totalState(hitStruct.sampleTime);
@@ -2423,31 +2423,31 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac
GuezHitStruct hitStruct;
hitStruct.originatorChargeTypeEtsString = TypeStruct(interaction.getMunition()).toString();
hitStruct.originatorId = interaction.getOriginatorIdentifier().EntityNumber;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
switch (interaction.getOriginatorType())
{
case rpr2::OriginatorTypeEnum16::Unknown:
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
break;
case rpr2::OriginatorTypeEnum16::NoMedicalTreatment:
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Participant;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant;
if (hitStruct.originatorId == 0)
hitStruct.originatorId = hitStruct.targetId;
break;
case rpr2::OriginatorTypeEnum16::Participant:
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Participant;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant;
if (hitStruct.originatorId == 0)
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ExerciseControl;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl;
break;
case rpr2::OriginatorTypeEnum16::AreaEffectSimulation:
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation;
hitStruct.originatorId = IdentifierStruct(interaction.getOriginatorIdentifier()).toInt64();
break;
case rpr2::OriginatorTypeEnum16::ObserverController:
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ObserverController;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ObserverController;
break;
case rpr2::OriginatorTypeEnum16::ExerciseControl:
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ExerciseControl;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl;
break;
}
hitStruct.position = ParticipantPosition(interaction.getTargetLocation()).toGeoPosition();
@@ -2458,16 +2458,16 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac
hitStruct.vulnerabilityState = getTacticalStatusEnum(interaction.getHitResult());
if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator_def::ExerciseControl ||
hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator_def::ObserverController
if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ExerciseControl ||
hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ObserverController
)
&& hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect)
&& hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::HitWithNoEffect)
{
auto ptr = m_damageModelMap.value(eqNo);
if (ptr)
{
hitStruct.vulnerabilityState = ptr->vulnerabilityState(hitStruct.sampleTime);
if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady)
if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
ptr->setTacticalStatus(rpr2::HitResultEnum16::Reset, simTimeToMSec(interaction.getReceiveTimeStamp()));
}
}
@@ -2714,7 +2714,7 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
switch (originatorType.underlying())
{
case ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
{
if (m_environmentObjects.contains(originatorEqNo))
is = IdentifierStruct(10 * originatorEqNo);
@@ -2734,14 +2734,14 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
originatorTypeRpr = rpr2::OriginatorTypeEnum16::AreaEffectSimulation;
break;
}
case ProjectDataManagement::StateChangeOriginator_def::ExerciseControl:
case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
originatorTypeRpr = rpr2::OriginatorTypeEnum16::ExerciseControl;
break;
case ProjectDataManagement::StateChangeOriginator_def::ObserverController:
case ProjectDataManagement::StateChangeOriginator::ObserverController:
originatorTypeRpr = rpr2::OriginatorTypeEnum16::ObserverController;
break;
case ProjectDataManagement::StateChangeOriginator_def::Participant:
if (originatorType == ProjectDataManagement::StateChangeOriginator_def::Participant)
case ProjectDataManagement::StateChangeOriginator::Participant:
if (originatorType == ProjectDataManagement::StateChangeOriginator::Participant)
{
if (m_playerMap.contains(originatorEqNo))
is = IdentifierStruct(originatorEqNo);
@@ -2756,16 +2756,16 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
break;
}
Q_FALLTHROUGH();
case ProjectDataManagement::StateChangeOriginator_def::Initialization:
case ProjectDataManagement::StateChangeOriginator_def::FunctionalArea:
case ProjectDataManagement::StateChangeOriginator_def::MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator_def::Unknown:
case ProjectDataManagement::StateChangeOriginator_def::WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator_def::MedicalTimeout:
case ProjectDataManagement::StateChangeOriginator_def::Sanitation:
case ProjectDataManagement::StateChangeOriginator::Initialization:
case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::Unknown:
case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
case ProjectDataManagement::StateChangeOriginator::Sanitation:
case ProjectDataManagement::StateChangeOriginator_def::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator_def::DusMine:
case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator::DusMine:
originatorTypeRpr = rpr2::OriginatorTypeEnum16::Unknown;
break;
}