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

Migrates residual Lts sources to generated rtiddsgen API

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

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/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;
}