Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+2
-2
@@ -450,7 +450,7 @@ QVector<ParticipantData> OrgChartMain::getDataOf(const QJsonObject &obj, int sup
|
||||
pData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString();
|
||||
pData.typeId(obj.value(QStringLiteral("typeId")).toInt());
|
||||
if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
|
||||
pData.assignState(static_cast<ParticipantAssignState_def::type>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
QJsonArray arr = obj.value(QStringLiteral("children")).toArray();
|
||||
int hierarNr = 1;
|
||||
for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem)
|
||||
@@ -510,7 +510,7 @@ ParticipantData OrgChartMain::convertFromJson(const QJsonObject &obj)
|
||||
pData.partyId(m_party);
|
||||
pData.id(obj.value(QStringLiteral("ddsId")).toInt());
|
||||
if (obj.value(QStringLiteral("assignState")).toInt() >= 0)
|
||||
pData.assignState(static_cast<ParticipantAssignState_def::type>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.assignState(static_cast<ParticipantAssignState>(obj.value(QStringLiteral("assignState")).toInt()));
|
||||
pData.symbol(obj.value(QStringLiteral("symbol")).toString().toStdString());
|
||||
return pData;
|
||||
}
|
||||
|
||||
+13
-13
@@ -301,26 +301,26 @@ AdvancedSymbology::Injury ParticipantOrgChart_MimeDataHelper::stateToInjury(cons
|
||||
{
|
||||
switch (state.underlying())
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState::CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
|
||||
case ProjectDataManagement::VulnerabilityState::NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
|
||||
return AdvancedSymbology::Injury::NoInjury;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState::LightDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::NotReady:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady:
|
||||
return AdvancedSymbology::Injury::Hit;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState::MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
|
||||
return AdvancedSymbology::Injury::MobilityKill;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
|
||||
return AdvancedSymbology::Injury::WeaponKill;
|
||||
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
|
||||
return AdvancedSymbology::Injury::TotalKill;
|
||||
default:
|
||||
return AdvancedSymbology::Injury::NoInjury;
|
||||
|
||||
Reference in new issue
Block a user