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
@@ -76,7 +76,7 @@ QString ForeignGuiComboboxInterfaceImpl::getAssignedAesField (const int particip
|
||||
|
||||
for (const auto &explosionCluster : m_aesDtc->explosionClusters())
|
||||
{
|
||||
if (explosionCluster.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired)
|
||||
if (explosionCluster.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
|
||||
continue;
|
||||
for ( const auto &esmParticipant : explosionCluster.esmParticipantIds())
|
||||
{
|
||||
@@ -114,7 +114,7 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
|
||||
ParticipantManagement::Participant participant = m_ppmDtc->participant(it.value());
|
||||
EffectShowManagement::EffectShowVehicleStatus effectShowVehicleStatus = effectShowVehicleStatuss.value(it.value());
|
||||
int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(effectShowVehicleStatus.esmParticipantId());
|
||||
bool isSmokeVehicle = effectShowVehicleStatus.feature() == Feature_e_def::Smoke;
|
||||
bool isSmokeVehicle = effectShowVehicleStatus.feature() == Feature_e::Smoke;
|
||||
|
||||
|
||||
|
||||
@@ -157,10 +157,10 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS
|
||||
|
||||
enum eFeature
|
||||
{
|
||||
NotSpecified = Feature_e_def::NotSpecified,
|
||||
Smoke = Feature_e_def::Smoke,
|
||||
Explosion24 = Feature_e_def::Explosion24,
|
||||
Explosion48 = Feature_e_def::Explosion48,
|
||||
NotSpecified = Feature_e::NotSpecified,
|
||||
Smoke = Feature_e::Smoke,
|
||||
Explosion24 = Feature_e::Explosion24,
|
||||
Explosion48 = Feature_e::Explosion48,
|
||||
SmokeAndExplosion48 = Explosion48 + 1
|
||||
};
|
||||
|
||||
|
||||
+4
-4
@@ -224,13 +224,13 @@ QVariant EffectShowActorModel::data(const QModelIndex &index, int role) const
|
||||
return QVariant();
|
||||
switch (vehicleStatus.feature().underlying())
|
||||
{
|
||||
case EffectShowManagement::Feature_e_def::Smoke:
|
||||
case EffectShowManagement::Feature_e::Smoke:
|
||||
return tr("Smoke");
|
||||
case EffectShowManagement::Feature_e_def::Explosion24:
|
||||
case EffectShowManagement::Feature_e::Explosion24:
|
||||
return tr("Explosion (24)");
|
||||
case EffectShowManagement::Feature_e_def::Explosion48:
|
||||
case EffectShowManagement::Feature_e::Explosion48:
|
||||
return tr("Explosion (48)");
|
||||
case EffectShowManagement::Feature_e_def::NotSpecified:
|
||||
case EffectShowManagement::Feature_e::NotSpecified:
|
||||
return tr("Not specified");
|
||||
}
|
||||
return tr("Unknown (%1)").arg(vehicleStatus.feature().underlying());
|
||||
|
||||
+4
-4
@@ -36,10 +36,10 @@ class EffectShowActorModel final : public LtsWidgets::LtsAbstractTableModel<Part
|
||||
enum Columns { Name, Status, BITE, Feature, Position, EffectShow, Relocation, RestMagazine, RestAmmunition };
|
||||
|
||||
enum eFeature {
|
||||
NotSpecified = Feature_e_def::NotSpecified,
|
||||
Smoke = Feature_e_def::Smoke,
|
||||
Explosion24 = Feature_e_def::Explosion24,
|
||||
Explosion48 = Feature_e_def::Explosion48,
|
||||
NotSpecified = Feature_e::NotSpecified,
|
||||
Smoke = Feature_e::Smoke,
|
||||
Explosion24 = Feature_e::Explosion24,
|
||||
Explosion48 = Feature_e::Explosion48,
|
||||
SmokeAndExplosion48 = Explosion48 + 1
|
||||
};
|
||||
|
||||
|
||||
+4
-4
@@ -135,10 +135,10 @@ bool EffectShowActorRelocationProxyModel::checkFilter(int source_row) const
|
||||
const auto effectShowSource = m_sourceModel->getRowData(source_row);
|
||||
|
||||
|
||||
if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut &&
|
||||
effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::PositionReached &&
|
||||
effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::Abort &&
|
||||
effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::Nonacceptance)
|
||||
if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut &&
|
||||
effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::PositionReached &&
|
||||
effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::Abort &&
|
||||
effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::Nonacceptance)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
+4
-4
@@ -149,9 +149,9 @@ QMap<int, QString> EffectShowModel::getParticipantList(bool is_smoke) const
|
||||
continue;
|
||||
|
||||
EffectShowManagement::Feature_e feature = m_effectShowActorModel->getFeature(realRow);
|
||||
if (feature != EffectShowManagement::Feature_e_def::NotSpecified &&
|
||||
((feature == EffectShowManagement::Feature_e_def::Smoke && is_smoke) ||
|
||||
(feature != EffectShowManagement::Feature_e_def::Smoke && !is_smoke)))
|
||||
if (feature != EffectShowManagement::Feature_e::NotSpecified &&
|
||||
((feature == EffectShowManagement::Feature_e::Smoke && is_smoke) ||
|
||||
(feature != EffectShowManagement::Feature_e::Smoke && !is_smoke)))
|
||||
ret.insert(part.id(), getParticipantName(part.id()));
|
||||
}
|
||||
return ret;
|
||||
@@ -479,7 +479,7 @@ bool EffectShowProxyModel::checkFilter(int source_row) const
|
||||
|
||||
const auto effectShowSource = m_sourceModel->getRowData(source_row);
|
||||
|
||||
if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut)
|
||||
if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user