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
+6
-6
@@ -68,15 +68,15 @@ bool DemandSituationFilter::init(const std::shared_ptr<Interface::Ftc> &ftc)
|
||||
|
||||
|
||||
std::set<ParticipantManagement::TypeClass> ppmTypeClass;
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass_def::SupportEntity);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass::SupportEntity);
|
||||
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass_def::Human);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass_def::GroundVehicle);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass::Human);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass::GroundVehicle);
|
||||
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass_def::VehicleWithGear);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass_def::WeaponSystem);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass::VehicleWithGear);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass::WeaponSystem);
|
||||
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass_def::Aircraft);
|
||||
ppmTypeClass.insert(ParticipantManagement::TypeClass::Aircraft);
|
||||
|
||||
QStringList typeClassList;
|
||||
typeClassList = m_opSettings->value(m_ocDemandFilterGroupString, QStringLiteral("TypeClass"),-1).toStringList();
|
||||
|
||||
+49
-49
@@ -226,8 +226,8 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
|
||||
if (data.stateHistory().size() > 0)
|
||||
{
|
||||
const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == ParticipantManagement::TypeClass::Human ?
|
||||
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
|
||||
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
|
||||
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
|
||||
|
||||
const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory());
|
||||
m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
|
||||
@@ -248,7 +248,7 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem
|
||||
|
||||
|
||||
|
||||
if (!data.specialSensorDataState() || m_typeClass == ParticipantManagement::TypeClass_def::Aircraft)
|
||||
if (!data.specialSensorDataState() || m_typeClass == ParticipantManagement::TypeClass::Aircraft)
|
||||
{
|
||||
m_ui->lblSpecialSensorState->hide();
|
||||
m_ui->lbSpecialSensorState->hide();
|
||||
@@ -353,74 +353,74 @@ void OcParticipantInfo::showSpecialSensorData(int specialSensorData)
|
||||
QString strSpecialSensorData;
|
||||
switch (specialSensorDataState)
|
||||
{
|
||||
case ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational);
|
||||
case ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting);
|
||||
case ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational);
|
||||
case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_Test:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_Test);
|
||||
case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir);
|
||||
case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounted:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounted);
|
||||
case ParticipantManagement::SpecialSensorStatus::AVLB_Mounted:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Mounted);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::AVLB_Deployed:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Deployed);
|
||||
case ParticipantManagement::SpecialSensorStatus::AVLB_Deployed:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Deployed);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounting:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounting);
|
||||
case ParticipantManagement::SpecialSensorStatus::AVLB_Mounting:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Mounting);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::AVLB_Deploying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Deploying);
|
||||
case ParticipantManagement::SpecialSensorStatus::AVLB_Deploying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Deploying);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineLayer_Operational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineLayer_Operational);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineLayer_Operational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineLayer_Operational);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineLayer_Laying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineLayer_Laying);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineLayer_Laying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineLayer_Laying);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_March:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_March);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_ReadyToClear:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_ReadyToClear);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_Clearing:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_Clearing);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_NotOperational);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ParameterInput:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ParameterInput);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Deploying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Deploying);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Resupply:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Resupply);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying);
|
||||
case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::ADLER_Operational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ADLER_Operational);
|
||||
case ParticipantManagement::SpecialSensorStatus::ADLER_Operational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_Operational);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::ADLER_ConditionallyOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ADLER_ConditionallyOperational);
|
||||
case ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational);
|
||||
break;
|
||||
case ParticipantManagement::SpecialSensorStatus_def::ADLER_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ADLER_NotOperational);
|
||||
case ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational:
|
||||
strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user