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
+28
-28
@@ -27,23 +27,23 @@ QVariant DetailedChartModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case COMBAT_READY:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::CombatReady).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady).size();
|
||||
case LIGHT_DAMAGE:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::LightDamage).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage).size();
|
||||
case MEDIUM_DAMAGE:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::MediumDamage).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage).size();
|
||||
case HEAVY_DAMAGE:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::HeavyDamage).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage).size();
|
||||
case MOBILITY_KILL:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::MobilityKill).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill).size();
|
||||
case VISIBLE_MOBILITY_KILL:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill).size();
|
||||
case WEAPON_SYSTEM_DAMAGE:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage).size();
|
||||
case VISIBLE_WEAPON_SYSTEM_DAMAGE:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage).size();
|
||||
case CATASTROPHIC_KILL:
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill).size();
|
||||
return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill).size();
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
@@ -58,23 +58,23 @@ QVariant DetailedChartModel::headerData(int section, Qt::Orientation orientation
|
||||
switch (section)
|
||||
{
|
||||
case COMBAT_READY:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
|
||||
case LIGHT_DAMAGE:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::LightDamage);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
|
||||
case MEDIUM_DAMAGE:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::MediumDamage);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage);
|
||||
case HEAVY_DAMAGE:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::HeavyDamage);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage);
|
||||
case MOBILITY_KILL:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::MobilityKill);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill);
|
||||
case VISIBLE_MOBILITY_KILL:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill);
|
||||
case WEAPON_SYSTEM_DAMAGE:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage);
|
||||
case VISIBLE_WEAPON_SYSTEM_DAMAGE:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage);
|
||||
case CATASTROPHIC_KILL:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
@@ -87,7 +87,7 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
|
||||
const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
|
||||
|
||||
if (!m_config.participantIds.contains(data.participantId()) ||
|
||||
stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
return;
|
||||
|
||||
|
||||
@@ -102,15 +102,15 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
|
||||
DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
|
||||
.getNGLLogger("OnlineReportDetailedChartModel")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::CombatReady, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::LightDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::MediumDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::HeavyDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::MobilityKill, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::CatastrophicKill, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage, QSet<int32_t>());
|
||||
m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, QSet<int32_t>());
|
||||
|
||||
auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
|
||||
{
|
||||
|
||||
+3
-3
@@ -44,9 +44,9 @@ QVariant SimpleChartModel::headerData(int section, Qt::Orientation orientation,
|
||||
switch (section)
|
||||
{
|
||||
case 0:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
|
||||
case 1:
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill);
|
||||
return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
@@ -64,7 +64,7 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
|
||||
DEBUG_LOG(m_logger) << "Participant id = " << data.participantId();
|
||||
DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
|
||||
|
||||
if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
setCombatReady(data.participantId());
|
||||
else
|
||||
setKilled(data.participantId());
|
||||
|
||||
Reference in new issue
Block a user