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/Apache/damage_model.cpp
+29 -29
View File
@@ -30,16 +30,16 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityStateFromDam
switch(status)
{
case rpr2::DamageStatusEnum32::NoDamage:
vs = ProjectDataManagement::VulnerabilityState_def::CombatReady;
vs = ProjectDataManagement::VulnerabilityState::CombatReady;
break;
case rpr2::DamageStatusEnum32::SlightDamage:
vs = ProjectDataManagement::VulnerabilityState_def::LightDamage;
vs = ProjectDataManagement::VulnerabilityState::LightDamage;
break;
case rpr2::DamageStatusEnum32::ModerateDamage:
vs = ProjectDataManagement::VulnerabilityState_def::HeavyDamage;
vs = ProjectDataManagement::VulnerabilityState::HeavyDamage;
break;
case rpr2::DamageStatusEnum32::Destroyed:
vs = ProjectDataManagement::VulnerabilityState_def::CatastrophicKill;
vs = ProjectDataManagement::VulnerabilityState::CatastrophicKill;
break;
}
@@ -63,31 +63,31 @@ rpr2::DamageStatusEnum32::ET DamageModel::damageState(qint64 simTimeMSec) const
switch (m_vulnerabilityStates.at(idx).vulnerabilityState.underlying())
{
case ProjectDataManagement::VulnerabilityState_def::CombatReady:
case ProjectDataManagement::VulnerabilityState::CombatReady:
return rpr2::DamageStatusEnum32::NoDamage;
case ProjectDataManagement::VulnerabilityState_def::LightDamage:
case ProjectDataManagement::VulnerabilityState::LightDamage:
return rpr2::DamageStatusEnum32::SlightDamage;
case ProjectDataManagement::VulnerabilityState_def::MediumDamage:
case ProjectDataManagement::VulnerabilityState_def::HeavyDamage:
case ProjectDataManagement::VulnerabilityState_def::MobilityKill:
case ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill:
case ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::MediumDamage:
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
case ProjectDataManagement::VulnerabilityState::MobilityKill:
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
return rpr2::DamageStatusEnum32::ModerateDamage;
case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill:
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
return rpr2::DamageStatusEnum32::Destroyed;
case ProjectDataManagement::VulnerabilityState_def::TemporarySeverance:
case ProjectDataManagement::VulnerabilityState_def::NearMiss:
case ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect:
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
case ProjectDataManagement::VulnerabilityState::NearMiss:
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
return rpr2::DamageStatusEnum32::NoDamage;
case ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged:
case ProjectDataManagement::VulnerabilityState_def::Reserved:
case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged:
case ProjectDataManagement::VulnerabilityState::Reserved:
return rpr2::DamageStatusEnum32::NoDamage;
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::DamageStatusEnum32::SlightDamage;
case ProjectDataManagement::VulnerabilityState_def::NotReady:
case ProjectDataManagement::VulnerabilityState::NotReady:
return rpr2::DamageStatusEnum32::NoDamage;
}
return rpr2::DamageStatusEnum32::NoDamage;
@@ -98,9 +98,9 @@ bool DamageModel::immobilized(qint64 simTimeMSec) const
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return false;
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::MobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
return true;
return false;
}
@@ -110,9 +110,9 @@ bool DamageModel::firePowerDisabled(qint64 simTimeMSec) const
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return false;
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::WeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage ||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
return true;
return false;
}
@@ -149,7 +149,7 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
{
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
return m_vulnerabilityStates.at(idx).vulnerabilityState;
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
explicit DamageModel(const ProjectDataManagement::VulnerabilityState &state);
explicit DamageModel(const IdentifierStruct &is, const rpr2::DamageStatusEnum32::ET &status);
explicit DamageModel(const IdentifierStruct &is)
: DamageModel(is, ProjectDataManagement::VulnerabilityState_def::CombatReady)
: DamageModel(is, ProjectDataManagement::VulnerabilityState::CombatReady)
{}
const IdentifierStruct &identifierStruct() const { return m_is; }
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
+25 -25
View File
@@ -986,10 +986,10 @@ void NgsConnector::onBaseEntityEntityIdentifierChanged(const rpr2::EntityIdentif
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, simTimeMSecs]() mutable
{
@@ -1048,10 +1048,10 @@ void NgsConnector::onEmbeddedSystemEntityIdentifierChanged(const rpr2::EntityIde
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, simTimeMSecs]() mutable
{
@@ -1149,11 +1149,11 @@ bool NgsConnector::onDamageStateChanged(const rpr2::EntityIdentifierStruct &eis,
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;
@@ -1303,7 +1303,7 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
ParticipantPosition pPos = interaction.isValidDetonationLocation() ? ParticipantPosition(interaction.getDetonationLocation()) : m_observerPositions.value(receiver);
TrainingAreaBase::TabPosition tPos;
tPos.position(pPos.toGeoPosition());
tPos.reportingSource(Core::PositionReportingSource_def::External);
tPos.reportingSource(Core::PositionReportingSource::External);
TrainingAreaBase::EquipmentState state;
@@ -1317,7 +1317,7 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
if (sender > 0)
{
state.originatorId(sender);
state.originatorType(ProjectDataManagement::StateChangeOriginator_def::Participant);
state.originatorType(ProjectDataManagement::StateChangeOriginator::Participant);
}
else
{
@@ -1326,28 +1326,28 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
if (source == QLatin1String("excon"))
{
state.originatorId(0);
state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
}
else if (source == QLatin1String("cis"))
{
state.originatorId(1);
state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
}
else if (source == QLatin1String("greenkey"))
{
state.originatorId(0);
state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ObserverController);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
}
else if (source == QLatin1String("optical"))
{
state.originatorId(0);
state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ObserverController);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
}
else
{
state.originatorId(2);
state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
}
}
state.sampleTime(simTimeToMSec(interaction.getReceiveTimeStamp()));
@@ -1708,16 +1708,16 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
switch (originatorType.underlying()) {
case ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation:
case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
{
break;
}
case ProjectDataManagement::StateChangeOriginator_def::ExerciseControl:
case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
break;
case ProjectDataManagement::StateChangeOriginator_def::ObserverController:
case ProjectDataManagement::StateChangeOriginator::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);
@@ -1731,14 +1731,14 @@ 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::Initialization:
case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::Unknown:
case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator_def::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator_def::DusMine:
case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator::DusMine:
break;
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
+2 -2
View File
@@ -113,12 +113,12 @@ struct GuezHitStruct
{
qint32 targetId = 0;
qint64 sampleTime = 0;
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::get_default();
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::get_default();
qint32 vulnerabilityKind = 0;
qint32 vulnerabilityBits = 0;
Core::GeoPosition position = Core::GeoPosition(0, 0, 0);
qint32 originatorId = 0;
ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator_def::get_default();
ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator::get_default();
QString originatorChargeTypeEtsString;
};
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp
+63 -63
View File
@@ -116,7 +116,7 @@ bool PpmHandler::init()
ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId)
{
if (partyId <= 0)
return ParticipantManagement::Role_def::Unknown;
return ParticipantManagement::Role::Unknown;
auto it = m_partyData.constFind(partyId);
if (it == m_partyData.constEnd())
{
@@ -124,7 +124,7 @@ ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId)
m_partyData = m_dtcPpm->partys();
it = m_partyData.constFind(partyId);
if (it == m_partyData.constEnd())
return ParticipantManagement::Role_def::Unknown;
return ParticipantManagement::Role::Unknown;
}
return it.value().role();
}
@@ -430,31 +430,31 @@ rpr2::DetonationResultCodeEnum8::ET PpmHandler::rpr2DetonationResultFromVulnerab
rpr2::DetonationResultCodeEnum8::ET status = rpr2::DetonationResultCodeEnum8::None;
switch(vulnerabilityState)
{
case TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady:
status = rpr2::DetonationResultCodeEnum8::None;
break;
case TrainingAreaBase::TetraIcd::VulnerabilityState::LightDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::MediumDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::HeavyDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::MobilityKill:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VisibleMobilityKill:
case TrainingAreaBase::TetraIcd::VulnerabilityState::WeaponSystemDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VisibleWeaponSystemDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_LightDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_MediumDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_HeavyDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_MobilityKill:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
status = rpr2::DetonationResultCodeEnum8::AirHit;
break;
case TrainingAreaBase::TetraIcd::VulnerabilityState::CatastrophicKill:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CatastrophicKill:
status = rpr2::DetonationResultCodeEnum8::EntityImpact;
break;
case TrainingAreaBase::TetraIcd::VulnerabilityState::TemporarySeverance:
case TrainingAreaBase::TetraIcd::VulnerabilityState::NearMiss:
case TrainingAreaBase::TetraIcd::VulnerabilityState::HitWithNoEffect:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_TemporarySeverance:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_NearMiss:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
status = rpr2::DetonationResultCodeEnum8::EntityProximateDetonation;
break;
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityBitsChanged:
case TrainingAreaBase::TetraIcd::VulnerabilityState::Reserved:
case TrainingAreaBase::TetraIcd::VulnerabilityState::NContamination:
case TrainingAreaBase::TetraIcd::VulnerabilityState::BContamination:
case TrainingAreaBase::TetraIcd::VulnerabilityState::CContamination:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_Reserved:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_NContamination:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_BContamination:
case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CContamination:
status = rpr2::DetonationResultCodeEnum8::Other;
break;
}
@@ -514,22 +514,22 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
bool bCreated;
switch (partType.typeClass().underlying())
{
case ParticipantManagement::TypeClass_def::Human:
case ParticipantManagement::TypeClass::Human:
bCreated = createHuman(participant);
break;
case ParticipantManagement::TypeClass_def::GroundVehicle:
case ParticipantManagement::TypeClass_def::VehicleWithGear:
case ParticipantManagement::TypeClass_def::WeaponSystem:
case ParticipantManagement::TypeClass::GroundVehicle:
case ParticipantManagement::TypeClass::VehicleWithGear:
case ParticipantManagement::TypeClass::WeaponSystem:
bCreated = createGroundVehicle(participant);
break;
case ParticipantManagement::TypeClass_def::Aircraft:
case ParticipantManagement::TypeClass::Aircraft:
bCreated = createAircraft(participant);
break;
case ParticipantManagement::TypeClass_def::SupportEntity:
case ParticipantManagement::TypeClass_def::Unit:
case ParticipantManagement::TypeClass::SupportEntity:
case ParticipantManagement::TypeClass::Unit:
case ParticipantManagement::TypeClass_def::Vessel:
case ParticipantManagement::TypeClass::Vessel:
default:
@@ -617,7 +617,7 @@ ProjectDataManagement::VulnerabilityState PpmHandler::currentVulnerabilityState(
return ts;
}
}
ts = ProjectDataManagement::VulnerabilityState_def::TemporarySeverance;
ts = ProjectDataManagement::VulnerabilityState::TemporarySeverance;
return ts;
}
@@ -729,97 +729,97 @@ rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIden
{
rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other;
switch (ppmForceIdentifier.underlying()) {
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_1:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1:
eqfi = rpr2::ForceIdentifierEnum8::Friendly;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_2:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_2:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_2;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_3:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_3:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_3;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_4:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_4:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_4;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_5:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_5:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_5;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_6:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_6:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_6;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_7:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_7:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_7;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_8:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_8:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_8;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_9:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_9:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_9;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_10:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_10:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_10;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_1:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_1:
eqfi = rpr2::ForceIdentifierEnum8::Opposing;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_2:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_2:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_2;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_3:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_3:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_3;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_4:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_4:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_4;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_5:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_5:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_5;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_6:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_6:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_6;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_7:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_7:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_7;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_8:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_8:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_8;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_9:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_9:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_9;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_10:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_10:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_10;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_1:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_1:
eqfi = rpr2::ForceIdentifierEnum8::Neutral;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_2:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_2:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_2;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_3:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_3:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_3;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_4:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_4:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_4;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_5:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_5:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_5;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_6:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_6:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_6;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_7:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_7:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_7;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_8:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_8:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_8;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_9:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_9:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_9;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_10:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_10:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_10;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Other:
case ParticipantManagement::HlaForceIdentifierEnum::Other:
eqfi = rpr2::ForceIdentifierEnum8::Other;
break;
}
@@ -894,15 +894,15 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct)
TrainingAreaBase::TabPosition pos;
pos.position(hitStruct.position);
pos.reportingSource(Core::PositionReportingSource_def::External);
pos.reportingSource(Core::PositionReportingSource::External);
TrainingAreaBase::EquipmentState es;
es.equipmentNumber(hitStruct.targetId);
es.originatorChargeTypeId(ct.id());
if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation)
if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
{
int aesItemId = 0;
if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType_def::AtUnknown)
if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown)
es.originatorId(hitStruct.originatorId % 10);
else
es.originatorId(aesItemId);
@@ -971,7 +971,7 @@ void PpmHandler::onEquipmentState(const TrainingAreaBase::EquipmentState &event)
bool PpmHandler::onExconEngagement(int eqNo, const ProjectDataManagement::VulnerabilityState &state)
{
if (state != ProjectDataManagement::VulnerabilityState_def::CombatReady)
if (state != ProjectDataManagement::VulnerabilityState::CombatReady)
{
TrainingAreaBase::DemandVulnerabilityStateChangeRequest req;
req.equipmentNumbers().push_back(eqNo);
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp
+198 -198
View File
@@ -203,14 +203,14 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
}
else if (data.effectStateId() == AesEffectState::EsPrepared &&
data.aesTypeId() == AesType_def::AtExplosionAreaSingleExplosions)
data.aesTypeId() == AesType::AtExplosionAreaSingleExplosions)
{
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " added";
m_aesItemViews.insert(data.aesItemId(), data);
m_takenIndicesForAesItem.insert(data.aesItemId(), QVector<int32_t>());
}
else if (data.aesTypeId() == AesType_def::AtBCContamination)
else if (data.aesTypeId() == AesType::AtBCContamination)
{
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
@@ -247,7 +247,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
m_takenIndicesForAesItem.remove(data.aesItemId());
return;
}
if (data.aesTypeId() != AesType_def::AtExplosionAreaSingleExplosions)
if (data.aesTypeId() != AesType::AtExplosionAreaSingleExplosions)
return;
if (!m_aesItemViews.contains(data.aesItemId()))
@@ -289,7 +289,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
m_handledImpactsStorage.removeAesItem(aesItemId);
return;
}
if (data.aesTypeId() != AesType_def::AtExplosionClusterSingleExplosions)
if (data.aesTypeId() != AesType::AtExplosionClusterSingleExplosions)
return;
const std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = data.singleEffects();
@@ -324,7 +324,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
{
++curSeIndex;
if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered)
if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
continue;
@@ -478,10 +478,10 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
bool AesHandler::isModifiable(const AreaEffectSimulation::AesItem &item)
{
return (item.effectStateId() == AesEffectState_def::EsCreated ||
item.effectStateId() == AesEffectState_def::EsPrepared ||
item.effectStateId() == AesEffectState_def::EsUnknown ||
item.effectStateId() == AesEffectState_def::EsReceived);
return (item.effectStateId() == AesEffectState::EsCreated ||
item.effectStateId() == AesEffectState::EsPrepared ||
item.effectStateId() == AesEffectState::EsUnknown ||
item.effectStateId() == AesEffectState::EsReceived);
}
@@ -493,9 +493,9 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
{
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -509,7 +509,7 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
req->name(newName);
break;
}
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -523,34 +523,34 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
req->name(newName);
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
break;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
break;
}
@@ -567,9 +567,9 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
{
m_requestHelper->startSingleRequest([req, this]()
{
@@ -577,7 +577,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
});
break;
}
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
m_requestHelper->startSingleRequest([req, this]()
{
@@ -585,34 +585,34 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
});
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
return;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
return;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
return;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
return;
}
@@ -629,9 +629,9 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
{
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -645,7 +645,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
req->effectStart(msecsSinceEpoch);
break;
}
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea";
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
@@ -661,34 +661,34 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
req->effectStart(msecsSinceEpoch);
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
break;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
break;
}
}
@@ -701,9 +701,9 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
{
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -717,7 +717,7 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
req->partyId(partyId);
break;
}
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -731,34 +731,34 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
req->partyId(partyId);
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
break;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
break;
}
}
@@ -784,9 +784,9 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
{
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
const int timeMSec = checkDuration(u_time, 60 * 60 * 1000, m_logger);
@@ -801,7 +801,7 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
req->effectDuration(timeMSec);
break;
}
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
const int timeMSec = checkDuration(u_time, 60 * 60 * 1000, m_logger);
@@ -816,34 +816,34 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
req->effectDuration(timeMSec);
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
break;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
break;
}
@@ -856,11 +856,11 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId)
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
break;
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -874,34 +874,34 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId)
req->chargeStruct().chargeTypeId(chargeTypeId);
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
break;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
break;
}
}
@@ -962,9 +962,9 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
switch (type.underlying())
{
case AreaEffectSimulation::AesType_def::AtBCContamination:
case AreaEffectSimulation::AesType::AtBCContamination:
break;
case AreaEffectSimulation::AesType_def::AtMineCorridor:
case AreaEffectSimulation::AesType::AtMineCorridor:
{
MineCorridorModifyRequest *req = static_cast<MineCorridorModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -987,7 +987,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
req->width(width);
break;
}
case AreaEffectSimulation::AesType_def::AtMineArea:
case AreaEffectSimulation::AesType::AtMineArea:
{
MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
if (!req)
@@ -1011,34 +1011,34 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
req->width(width);
break;
}
case AreaEffectSimulation::AesType_def::AtNContamination:
case AreaEffectSimulation::AesType::AtNContamination:
break;
case AreaEffectSimulation::AesType_def::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionArea:
break;
case AreaEffectSimulation::AesType_def::AtExplosionSingle:
case AreaEffectSimulation::AesType::AtExplosionSingle:
break;
case AreaEffectSimulation::AesType_def::AtAirSupportImpact:
case AreaEffectSimulation::AesType::AtAirSupportImpact:
break;
case AreaEffectSimulation::AesType_def::AtUnknown:
case AreaEffectSimulation::AesType_def::AtDangerArea:
case AreaEffectSimulation::AesType_def::AtFunctionalArea:
case AreaEffectSimulation::AesType_def::AtBorderline:
case AreaEffectSimulation::AesType_def::AtTechnicalArea:
case AreaEffectSimulation::AesType_def::AtReconArea:
case AreaEffectSimulation::AesType_def::AtDusSingleMine:
case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType_def::AtGasPipe:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType_def::AtBoobyTrap:
case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType_def::AtOffRouteMine:
case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType_def::AtExplosionCluster:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine:
case AreaEffectSimulation::AesType::AtUnknown:
case AreaEffectSimulation::AesType::AtDangerArea:
case AreaEffectSimulation::AesType::AtFunctionalArea:
case AreaEffectSimulation::AesType::AtBorderline:
case AreaEffectSimulation::AesType::AtTechnicalArea:
case AreaEffectSimulation::AesType::AtReconArea:
case AreaEffectSimulation::AesType::AtDusSingleMine:
case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions:
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
case AreaEffectSimulation::AesType::AtGasPipe:
case AreaEffectSimulation::AesType::AtExplosionSingleCentral:
case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory:
case AreaEffectSimulation::AesType::AtBoobyTrap:
case AreaEffectSimulation::AesType::AtBoobyTrapSecondary:
case AreaEffectSimulation::AesType::AtOffRouteMine:
case AreaEffectSimulation::AesType::AtOffRouteMineSecondary:
case AreaEffectSimulation::AesType::AtExplosionCluster:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions:
case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory:
case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine:
break;
}
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp
+14 -14
View File
@@ -215,35 +215,35 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
{
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
switch (m_tacticalStates.at(idx).tss.TacticalStatus)
{
case rpr2::TacticalStatusEnum8::CombatReady:
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
case rpr2::TacticalStatusEnum8::LightHit:
return ProjectDataManagement::VulnerabilityState_def::LightDamage;
return ProjectDataManagement::VulnerabilityState::LightDamage;
case rpr2::TacticalStatusEnum8::MediumHit:
return ProjectDataManagement::VulnerabilityState_def::MediumDamage;
return ProjectDataManagement::VulnerabilityState::MediumDamage;
case rpr2::TacticalStatusEnum8::HeavyHit:
return ProjectDataManagement::VulnerabilityState_def::HeavyDamage;
return ProjectDataManagement::VulnerabilityState::HeavyDamage;
case rpr2::TacticalStatusEnum8::Immobilized:
return ProjectDataManagement::VulnerabilityState_def::MobilityKill;
return ProjectDataManagement::VulnerabilityState::MobilityKill;
case rpr2::TacticalStatusEnum8::ImmobilizedVisible:
return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill;
return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
case rpr2::TacticalStatusEnum8::WeaponKill:
return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage;
return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
case rpr2::TacticalStatusEnum8::WeaponKillVisible:
return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage;
return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
case rpr2::TacticalStatusEnum8::TotalKill:
return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill;
return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
case rpr2::TacticalStatusEnum8::TemporaryFailure:
return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance;
return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
case rpr2::TacticalStatusEnum8::NearMiss:
return ProjectDataManagement::VulnerabilityState_def::NearMiss;
return ProjectDataManagement::VulnerabilityState::NearMiss;
case rpr2::TacticalStatusEnum8::HitWithoutEffect:
return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect;
return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
}
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
}
int DamageModel::indexForTime(qint64 simTimeMSec) const
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;
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
+2 -2
View File
@@ -130,12 +130,12 @@ struct GuezHitStruct
{
qint32 targetId = 0;
qint64 sampleTime = 0;
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::get_default();
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::get_default();
qint32 vulnerabilityKind = 0;
qint32 vulnerabilityBits = 0;
Core::GeoPosition position = Core::GeoPosition(0, 0, 0);
qint64 originatorId = 0;
ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator_def::get_default();
ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator::get_default();
QString originatorChargeTypeEtsString;
};
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp
+53 -53
View File
@@ -120,7 +120,7 @@ bool PpmHandler::init()
ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId)
{
if (partyId <= 0)
return ParticipantManagement::Role_def::Unknown;
return ParticipantManagement::Role::Unknown;
auto it = m_partyData.constFind(partyId);
if (it == m_partyData.constEnd())
{
@@ -128,7 +128,7 @@ ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId)
m_partyData = m_dtcPpm->partys();
it = m_partyData.constFind(partyId);
if (it == m_partyData.constEnd())
return ParticipantManagement::Role_def::Unknown;
return ParticipantManagement::Role::Unknown;
}
return it.value().role();
}
@@ -381,8 +381,8 @@ void PpmHandler::onParticipantReceivedInit(int eqId, qint64 simTimeMSecs)
init.equipmentNumber(eqId);
init.sampleTime(simTimeMSecs);
init.vulnerabilityBits(1);
init.vulnerabilityState(ProjectDataManagement::VulnerabilityState_def::CombatReady);
init.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl);
init.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
init.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
m_dtsTab->publish(init);
}
@@ -490,15 +490,15 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
bool bCreated;
switch (partType.typeClass().underlying())
{
case ParticipantManagement::TypeClass_def::Human:
case ParticipantManagement::TypeClass::Human:
bCreated = createHuman(participant);
break;
case ParticipantManagement::TypeClass_def::GroundVehicle:
case ParticipantManagement::TypeClass_def::VehicleWithGear:
case ParticipantManagement::TypeClass_def::WeaponSystem:
case ParticipantManagement::TypeClass::GroundVehicle:
case ParticipantManagement::TypeClass::VehicleWithGear:
case ParticipantManagement::TypeClass::WeaponSystem:
bCreated = createGroundVehicle(participant);
break;
case ParticipantManagement::TypeClass_def::SupportEntity:
case ParticipantManagement::TypeClass::SupportEntity:
bCreated = createObserverController(participant);
break;
default:
@@ -661,97 +661,97 @@ rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIden
{
rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other;
switch (ppmForceIdentifier.underlying()) {
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_1:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1:
eqfi = rpr2::ForceIdentifierEnum8::Friendly;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_2:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_2:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_2;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_3:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_3:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_3;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_4:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_4:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_4;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_5:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_5:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_5;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_6:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_6:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_6;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_7:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_7:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_7;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_8:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_8:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_8;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_9:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_9:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_9;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_10:
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_10:
eqfi = rpr2::ForceIdentifierEnum8::Friendly_10;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_1:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_1:
eqfi = rpr2::ForceIdentifierEnum8::Opposing;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_2:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_2:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_2;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_3:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_3:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_3;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_4:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_4:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_4;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_5:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_5:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_5;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_6:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_6:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_6;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_7:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_7:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_7;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_8:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_8:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_8;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_9:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_9:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_9;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_10:
case ParticipantManagement::HlaForceIdentifierEnum::Opposing_10:
eqfi = rpr2::ForceIdentifierEnum8::Opposing_10;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_1:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_1:
eqfi = rpr2::ForceIdentifierEnum8::Neutral;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_2:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_2:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_2;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_3:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_3:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_3;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_4:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_4:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_4;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_5:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_5:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_5;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_6:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_6:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_6;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_7:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_7:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_7;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_8:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_8:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_8;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_9:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_9:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_9;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_10:
case ParticipantManagement::HlaForceIdentifierEnum::Neutral_10:
eqfi = rpr2::ForceIdentifierEnum8::Neutral_10;
break;
case ParticipantManagement::HlaForceIdentifierEnum_def::Other:
case ParticipantManagement::HlaForceIdentifierEnum::Other:
eqfi = rpr2::ForceIdentifierEnum8::Other;
break;
}
@@ -826,15 +826,15 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct)
TrainingAreaBase::TabPosition pos;
pos.position(hitStruct.position);
pos.reportingSource(Core::PositionReportingSource_def::External);
pos.reportingSource(Core::PositionReportingSource::External);
TrainingAreaBase::EquipmentState es;
es.equipmentNumber(hitStruct.targetId);
es.originatorChargeTypeId(ct.id());
if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation)
if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
{
int aesItemId = 0;
if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType_def::AtUnknown)
if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown)
es.originatorId((hitStruct.originatorId & 0xffff) / 10);
else
es.originatorId(aesItemId);
@@ -963,25 +963,25 @@ bool PpmHandler::onExconInit(int eqNo, rpr2::ResetPlayerEnum8::ET rp, rpr2::Acti
});
}
ProjectDataManagement::WphMode helmet = ProjectDataManagement::WphMode_def::NoChange;;
ProjectDataManagement::WphMode vest = ProjectDataManagement::WphMode_def::NoChange;
ProjectDataManagement::WphMode helmet = ProjectDataManagement::WphMode::NoChange;;
ProjectDataManagement::WphMode vest = ProjectDataManagement::WphMode::NoChange;
bool bNoChange = false;
switch (aho) {
case rpr2::ActivateHelmetObservationEnum8::WithoutHelmetWithoutVest:
helmet = ProjectDataManagement::WphMode_def::Without;
vest = ProjectDataManagement::WphMode_def::Without;
helmet = ProjectDataManagement::WphMode::Without;
vest = ProjectDataManagement::WphMode::Without;
break;
case rpr2::ActivateHelmetObservationEnum8::HelmetWithoutVest:
helmet = ProjectDataManagement::WphMode_def::With;
vest = ProjectDataManagement::WphMode_def::Without;
helmet = ProjectDataManagement::WphMode::With;
vest = ProjectDataManagement::WphMode::Without;
break;
case rpr2::ActivateHelmetObservationEnum8::HelmetAndVest:
helmet = ProjectDataManagement::WphMode_def::With;
vest = ProjectDataManagement::WphMode_def::With;
helmet = ProjectDataManagement::WphMode::With;
vest = ProjectDataManagement::WphMode::With;
break;
case rpr2::ActivateHelmetObservationEnum8::NoChange:
helmet = ProjectDataManagement::WphMode_def::NoChange;
vest = ProjectDataManagement::WphMode_def::NoChange;
helmet = ProjectDataManagement::WphMode::NoChange;
vest = ProjectDataManagement::WphMode::NoChange;
bNoChange = true;
break;
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp
+14 -14
View File
@@ -215,35 +215,35 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
{
int idx = indexForTime(simTimeMSec);
if (idx < 0)
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
switch (m_tacticalStates.at(idx).tss.TacticalStatus)
{
case rpr2::TacticalStatusEnum8::CombatReady:
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
case rpr2::TacticalStatusEnum8::LightHit:
return ProjectDataManagement::VulnerabilityState_def::LightDamage;
return ProjectDataManagement::VulnerabilityState::LightDamage;
case rpr2::TacticalStatusEnum8::MediumHit:
return ProjectDataManagement::VulnerabilityState_def::MediumDamage;
return ProjectDataManagement::VulnerabilityState::MediumDamage;
case rpr2::TacticalStatusEnum8::HeavyHit:
return ProjectDataManagement::VulnerabilityState_def::HeavyDamage;
return ProjectDataManagement::VulnerabilityState::HeavyDamage;
case rpr2::TacticalStatusEnum8::Immobilized:
return ProjectDataManagement::VulnerabilityState_def::MobilityKill;
return ProjectDataManagement::VulnerabilityState::MobilityKill;
case rpr2::TacticalStatusEnum8::ImmobilizedVisible:
return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill;
return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill;
case rpr2::TacticalStatusEnum8::WeaponKill:
return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage;
return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage;
case rpr2::TacticalStatusEnum8::WeaponKillVisible:
return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage;
return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage;
case rpr2::TacticalStatusEnum8::TotalKill:
return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill;
return ProjectDataManagement::VulnerabilityState::CatastrophicKill;
case rpr2::TacticalStatusEnum8::TemporaryFailure:
return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance;
return ProjectDataManagement::VulnerabilityState::TemporarySeverance;
case rpr2::TacticalStatusEnum8::NearMiss:
return ProjectDataManagement::VulnerabilityState_def::NearMiss;
return ProjectDataManagement::VulnerabilityState::NearMiss;
case rpr2::TacticalStatusEnum8::HitWithoutEffect:
return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect;
return ProjectDataManagement::VulnerabilityState::HitWithNoEffect;
}
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
return ProjectDataManagement::VulnerabilityState::CombatReady;
}
int DamageModel::indexForTime(qint64 simTimeMSec) const
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
+47 -47
View File
@@ -1231,33 +1231,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;
@@ -1270,37 +1270,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)
@@ -1335,10 +1335,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
{
@@ -1619,11 +1619,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);
@@ -1910,31 +1910,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();
@@ -1945,16 +1945,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()));
}
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
+2 -2
View File
@@ -130,12 +130,12 @@ struct GuezHitStruct
{
qint32 targetId = 0;
qint64 sampleTime = 0;
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::get_default();
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::get_default();
qint32 vulnerabilityKind = 0;
qint32 vulnerabilityBits = 0;
Core::GeoPosition position = Core::GeoPosition(0, 0, 0);
qint64 originatorId = 0;
ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator_def::get_default();
ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator::get_default();
QString originatorChargeTypeEtsString;
};