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
+3
-3
@@ -600,11 +600,11 @@ QString AssignmentParticipantModel::effectToString(const Effect &effect) const
|
||||
{
|
||||
switch (effect.underlying())
|
||||
{
|
||||
case TargetManagement::Effect_def::NearMiss:
|
||||
case TargetManagement::Effect::NearMiss:
|
||||
return tr("NearMiss");
|
||||
case TargetManagement::Effect_def::MobilityKill:
|
||||
case TargetManagement::Effect::MobilityKill:
|
||||
return tr("MobilityKill");
|
||||
case TargetManagement::Effect_def::WeaponKill:
|
||||
case TargetManagement::Effect::WeaponKill:
|
||||
return tr("WeaponKill");
|
||||
default:
|
||||
{
|
||||
|
||||
+2
-2
@@ -72,9 +72,9 @@ QString ParticipantHandler::target_wmsTypeClassToString(const ParticipantManagem
|
||||
{
|
||||
switch (wmsTypeClass.underlying())
|
||||
{
|
||||
case ParticipantManagement::WmsTypeClass_def::TargetHuman:
|
||||
case ParticipantManagement::WmsTypeClass::TargetHuman:
|
||||
return QStringLiteral("Human");
|
||||
case ParticipantManagement::WmsTypeClass_def::TargetVehicle:
|
||||
case ParticipantManagement::WmsTypeClass::TargetVehicle:
|
||||
return QStringLiteral("Vehicle");
|
||||
break;
|
||||
default:
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ public:
|
||||
int getParticipantIdToEquipmentNumber(int participantId) const { return m_participantIdToEq.value(participantId, -1); }
|
||||
|
||||
ParticipantManagement::WmsTypeClass getParticipantIdToWmsTypeClass(int participantId) const
|
||||
{ return m_participantIdToWmsTypeClass.value(participantId, ParticipantManagement::WmsTypeClass_def::None); }
|
||||
{ return m_participantIdToWmsTypeClass.value(participantId, ParticipantManagement::WmsTypeClass::None); }
|
||||
|
||||
static QString target_wmsTypeClassToString(const ParticipantManagement::WmsTypeClass &wmsTypeClass);
|
||||
|
||||
|
||||
+5
-5
@@ -142,9 +142,9 @@ void AssignmentEditDialog::fillCmbEffect(QComboBox *cmb)
|
||||
{
|
||||
if (!cmb)
|
||||
return;
|
||||
cmb->addItem(tr("Near Miss"), TargetManagement::Effect_def::NearMiss);
|
||||
cmb->addItem(tr("Mobility Kill"), TargetManagement::Effect_def::MobilityKill);
|
||||
cmb->addItem(tr("WeaponK ill"), TargetManagement::Effect_def::WeaponKill);
|
||||
cmb->addItem(tr("Near Miss"), TargetManagement::Effect::NearMiss);
|
||||
cmb->addItem(tr("Mobility Kill"), TargetManagement::Effect::MobilityKill);
|
||||
cmb->addItem(tr("WeaponK ill"), TargetManagement::Effect::WeaponKill);
|
||||
cmb->setCurrentIndex(0);
|
||||
}
|
||||
|
||||
@@ -227,11 +227,11 @@ bool AssignmentEditDialog::apply()
|
||||
{
|
||||
ShootbackConfiguration &configRef = m_assignment.configuration();
|
||||
configRef.interval1(m_ui->sb_preWarningInterval->value());
|
||||
configRef.effect1( static_cast<Effect::inner_enum>(m_ui->cmb_preWarningEffect->currentData().toInt()) );
|
||||
configRef.effect1( static_cast<Effect>(m_ui->cmb_preWarningEffect->currentData().toInt()) );
|
||||
configRef.flash1(m_ui->cb_flashAfterExpiration_1->isChecked());
|
||||
|
||||
configRef.interval2(m_ui->sb_timeToEffectInterval->value());
|
||||
configRef.effect2( static_cast<Effect::inner_enum>(m_ui->cmb_timeToEffectEffect->currentData().toInt()) );
|
||||
configRef.effect2( static_cast<Effect>(m_ui->cmb_timeToEffectEffect->currentData().toInt()) );
|
||||
configRef.flash2(m_ui->cb_flashAfterExpiration_2->isChecked());
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -111,12 +111,12 @@ bool get(const QJsonObject &obj, const QString &key, Effect &val, bool bOptional
|
||||
{
|
||||
int iVal;
|
||||
get(obj, key, iVal, bOptional);
|
||||
switch (static_cast<Effect_def::type>(iVal))
|
||||
switch (static_cast<Effect>(iVal))
|
||||
{
|
||||
case Effect_def::NearMiss:
|
||||
case Effect_def::MobilityKill:
|
||||
case Effect_def::WeaponKill:
|
||||
val = Effect( static_cast<Effect_def::type>(iVal) );
|
||||
case Effect::NearMiss:
|
||||
case Effect::MobilityKill:
|
||||
case Effect::WeaponKill:
|
||||
val = Effect( static_cast<Effect>(iVal) );
|
||||
return true;
|
||||
}
|
||||
throw JsonException(obj, key);
|
||||
|
||||
+2
-2
@@ -124,11 +124,11 @@ struct ShootbackConfigurationData final : public TargetBaseTmpl<ShootbackConfigu
|
||||
|
||||
int interval1{-1};
|
||||
bool flash1{false};
|
||||
TargetManagement::Effect effect1{TargetManagement::Effect_def::NearMiss};
|
||||
TargetManagement::Effect effect1{TargetManagement::Effect::NearMiss};
|
||||
|
||||
int interval2{-1};
|
||||
bool flash2{false};
|
||||
TargetManagement::Effect effect2{TargetManagement::Effect_def::NearMiss};
|
||||
TargetManagement::Effect effect2{TargetManagement::Effect::NearMiss};
|
||||
|
||||
|
||||
QJsonObject toJson() const override;
|
||||
|
||||
Reference in new issue
Block a user