lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp
+2 -2
View File
@@ -123,8 +123,8 @@ bool ExplosionSingleCentral2SituationMap::updateElementImpl(const Sim2SituationM
partyId = 0;
mapObj->setPartyId(partyId);
const bool changeToActive = (ddsData.effectStateId().underlying()==AreaEffectSimulation::AesEffectState_def::EsActivated) &&
(static_cast<int>(mapObj->aesState()) < static_cast<int>(AreaEffectSimulation::AesEffectState_def::EsActivated));
const bool changeToActive = (ddsData.effectStateId().underlying()==AreaEffectSimulation::AesEffectState::EsActivated) &&
(static_cast<int>(mapObj->aesState()) < static_cast<int>(AreaEffectSimulation::AesEffectState::EsActivated));
mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying()));
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h
+1 -1
View File
@@ -18,7 +18,7 @@ struct Aes2SituationMapTraits<ExplosionSingleCentral2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::ExplosionSingleCentral;
using MAP_TYPE = SituationMap::SingleFireCentral;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory;
};
class ExplosionSingleCentral2SituationMap final : public Aes2SituationMap<ExplosionSingleCentral2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
+19 -19
View File
@@ -231,7 +231,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtExplosionSingle;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionSingle;
ExplosionSingle2SituationMap *sim2Map = static_cast<ExplosionSingle2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -262,7 +262,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtExplosionArea;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionArea;
ExplosionArea2SituationMap *sim2Map = static_cast<ExplosionArea2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -277,7 +277,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtMineArea;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineArea;
MineArea2SituationMap *sim2Map = static_cast<MineArea2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -305,7 +305,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtMineCorridor;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineCorridor;
MineCorridor2SituationMap *sim2Map = static_cast<MineCorridor2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -319,7 +319,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtBCContamination;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBCContamination;
BCContamination2SituationMap *sim2Map = static_cast<BCContamination2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -344,7 +344,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtNContamination;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtNContamination;
NContamination2SituationMap *sim2Map = static_cast<NContamination2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -360,7 +360,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
int drawOrder = 0;
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtExplosionCluster;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionCluster;
ExplosionCluster2SituationMap *sim2Map = static_cast<ExplosionCluster2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -377,7 +377,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtEffectCluster;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtEffectCluster;
EffectCluster2SituationMap *sim2Map = static_cast<EffectCluster2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -412,11 +412,11 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
if (m_map->mode() == Mode::Mode_3D)
{
INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType_def::AtBoobyTrap, AreaEffectSimulation::AesType_def::AtOffRouteMine});
initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType::AtBoobyTrap, AreaEffectSimulation::AesType::AtOffRouteMine});
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtBoobyTrap;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap;
BoobyTrap2SituationMap *sim2Map = static_cast<BoobyTrap2SituationMap *>(m_aes2MapCont.value(aesType));
if (!sim2Map)
{
@@ -430,7 +430,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtOffRouteMine;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtOffRouteMine;
OffRoute2SituationMap *sim2Map = static_cast<OffRoute2SituationMap *>(m_aes2MapCont.value(aesType));
if (!sim2Map)
{
@@ -449,7 +449,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtDangerArea;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDangerArea;
DangerArea2SituationMap *sim2Map = static_cast<DangerArea2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -463,7 +463,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtFunctionalArea;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtFunctionalArea;
FunctionalArea2SituationMap *sim2Map = static_cast<FunctionalArea2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -477,7 +477,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtBorderline;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBorderline;
Borderline2SituationMap *sim2Map = static_cast<Borderline2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -491,7 +491,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtReconArea;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtReconArea;
ReconArea2SituationMap *sim2Map = static_cast<ReconArea2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -508,7 +508,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtDusSingleMine;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDusSingleMine;
DusSingleMine2SituationMap *sim2Map = static_cast<DusSingleMine2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -525,7 +525,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtGasPipe;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtGasPipe;
GasPipe2SituationMap *sim2Map = static_cast<GasPipe2SituationMap *>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -542,7 +542,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtAirSupportImpact;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtAirSupportImpact;
AirSupportImpact2SituationMap *sim2Map = static_cast<AirSupportImpact2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
@@ -558,7 +558,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
{
AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtTechnicalArea;
AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtTechnicalArea;
TechnicalArea2SituationMap *sim2Map = static_cast<TechnicalArea2SituationMap*>(m_aes2MapCont.value(aesType));
if (! sim2Map)
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h
+13 -13
View File
@@ -59,20 +59,20 @@ inline SituationMap::AesEffectState effectState2aesState(AreaEffectSimulation::A
switch (effectState.underlying())
{
case AreaEffectSimulation::AesEffectState_def::EsUnknown:
case AreaEffectSimulation::AesEffectState_def::EsError:
case AreaEffectSimulation::AesEffectState_def::EsExpired:
case AreaEffectSimulation::AesEffectState_def::EsRemoved:
case AreaEffectSimulation::AesEffectState_def::EsPaused:
case AreaEffectSimulation::AesEffectState_def::EsReceived:
case AreaEffectSimulation::AesEffectState_def::EsCreated:
case AreaEffectSimulation::AesEffectState::EsUnknown:
case AreaEffectSimulation::AesEffectState::EsError:
case AreaEffectSimulation::AesEffectState::EsExpired:
case AreaEffectSimulation::AesEffectState::EsRemoved:
case AreaEffectSimulation::AesEffectState::EsPaused:
case AreaEffectSimulation::AesEffectState::EsReceived:
case AreaEffectSimulation::AesEffectState::EsCreated:
aesState = AesEffectState::Created;
break;
case AreaEffectSimulation::AesEffectState_def::EsFired:
case AreaEffectSimulation::AesEffectState_def::EsPrepared:
case AreaEffectSimulation::AesEffectState::EsFired:
case AreaEffectSimulation::AesEffectState::EsPrepared:
aesState = AesEffectState::Prepared;
break;
case AreaEffectSimulation::AesEffectState_def::EsActivated:
case AreaEffectSimulation::AesEffectState::EsActivated:
aesState = AesEffectState::Activated;
break;
}
@@ -292,9 +292,9 @@ protected:
const AreaEffectSimulation::AesEffectState &aesEffectState = ddsData.effectStateId();
if (ddsData.isDeleted())
return true;
if (aesEffectState == AreaEffectSimulation::AesEffectState_def::EsRemoved)
if (aesEffectState == AreaEffectSimulation::AesEffectState::EsRemoved)
return true;
if (aesEffectState == AreaEffectSimulation::AesEffectState_def::EsExpired)
if (aesEffectState == AreaEffectSimulation::AesEffectState::EsExpired)
{
if (!ddsData.effectStart().is_set())
return true;
@@ -317,7 +317,7 @@ protected:
if (data.isDeleted())
return false;
if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsExpired)
if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsExpired)
return false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h
+1 -1
View File
@@ -18,7 +18,7 @@ struct Aes2SituationMapTraits<AirSupportImpact2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::AirSupportImpact;
using MAP_TYPE = SituationMap::SingleFire;
static const AreaEffectSimulation::AesType::type aesType = AreaEffectSimulation::AesType::AtAirSupportImpact;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtAirSupportImpact;
};
class AirSupportImpact2SituationMap final : public Aes2SituationMap<AirSupportImpact2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ bool AlarmToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
if (data.eventType().underlying() != ProjectDataManagement::PdmEventType_def::EmergencyCall)
if (data.eventType().underlying() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
return true;
return false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct Aes2SituationMapTraits<BCContamination2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::BCContamination;
using MAP_TYPE = SituationMap::SingleFire;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtBCContamination;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBCContamination;
};
class BCContamination2SituationMap final : public Aes2SituationMap<BCContamination2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp
+3 -3
View File
@@ -330,7 +330,7 @@ bool BoobyTrap2SituationMap::isVisibleByFilter(const DDS_TYPE &data) const
const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
if (isVisibleByFilter)
isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType_def::AtMineArea,
isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType::AtMineArea,
data.effectStateId(),
data.chargeStruct().chargeTypeId(),
partyId,
@@ -344,8 +344,8 @@ bool BoobyTrap2SituationMap::isVisibleByFilter(const DDS_TYPE &data) const
void BoobyTrap2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
{
if ((AreaEffectSimulation::AesType_def::AtBoobyTrap != aesType.underlying()) &&
(AreaEffectSimulation::AesType_def::AtMineArea != aesType.underlying()))
if ((AreaEffectSimulation::AesType::AtBoobyTrap != aesType.underlying()) &&
(AreaEffectSimulation::AesType::AtMineArea != aesType.underlying()))
return;
const auto cb = [this](const DDS_TYPE &data) -> bool
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h
+1 -1
View File
@@ -22,7 +22,7 @@ struct Aes2SituationMapTraits<BoobyTrap2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::BoobyTrap;
using MAP_TYPE = SituationMap::VirtualMine;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtBoobyTrap;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap;
};
class BoobyTrap2SituationMap final : public Aes2SituationMap<BoobyTrap2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h
+1 -1
View File
@@ -21,7 +21,7 @@ struct Aes2SituationMapTraits<Borderline2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::Borderline;
using MAP_TYPE = SituationMap::Polyline;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtBorderline;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBorderline;
};
class Borderline2SituationMap final : public Aes2SituationMap<Borderline2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
+1 -1
View File
@@ -421,7 +421,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
continue;
if (parentSe.structureElementTypeId().underlying() != InfrastructureManagement::StructureElementType_def::Floor)
if (parentSe.structureElementTypeId().underlying() != InfrastructureManagement::StructureElementType::Floor)
continue;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp
+4 -4
View File
@@ -95,10 +95,10 @@ bool Building2SituationMap::isElapsed(const InfrastructureManagement::MainStruct
const InfrastructureManagement::StructureElementType::inner_enum set = ddsData.structureElementTypeId().underlying();
if ((set == InfrastructureManagement::StructureElementType_def::MeteoDataUnit) ||
(set == InfrastructureManagement::StructureElementType_def::RadioStation) ||
(set == InfrastructureManagement::StructureElementType_def::ApproachingPoint)
const InfrastructureManagement::StructureElementType set = ddsData.structureElementTypeId().underlying();
if ((set == InfrastructureManagement::StructureElementType::MeteoDataUnit) ||
(set == InfrastructureManagement::StructureElementType::RadioStation) ||
(set == InfrastructureManagement::StructureElementType::ApproachingPoint)
)
return true;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp
+25 -25
View File
@@ -73,7 +73,7 @@ bool ChargeEffectToMap::init(PluginProvider *pluginProvider)
m_displayFilter->addChangedCallback(this);
}
onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtExplosionArea);
onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtExplosionArea);
connect(m_pluginProvider, &PluginProvider::partitionTimeChanged, this, &ChargeEffectToMap::onPartitionTimeChanged, Qt::UniqueConnection);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
@@ -108,7 +108,7 @@ bool ChargeEffectToMap::run()
m_pluginProvider->aesDtc()->trajectoryTimeAwares([this](const AreaEffectSimulation::TrajectoryTimeAware &data)
{ onTracjectoryChanged(data, DataModification::eAdded); });
onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtExplosionArea);
onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtExplosionArea);
return true;
}
@@ -549,8 +549,8 @@ void ChargeEffectToMap::updateImpacts2D3D(RefPointer<MAP_T> &mapObj, const DDS_T
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
static QVector<AreaEffectSimulation::AesEffectState_def::type> relevantEffectStates
= {AreaEffectSimulation::AesEffectState_def::EsActivated, AreaEffectSimulation::AesEffectState_def::EsFired};
static QVector<AreaEffectSimulation::AesEffectState> relevantEffectStates
= {AreaEffectSimulation::AesEffectState::EsActivated, AreaEffectSimulation::AesEffectState::EsFired};
const bool bDisplayDueToEffectState = relevantEffectStates.contains(data.state().underlying());
@@ -564,11 +564,11 @@ void ChargeEffectToMap::updateImpacts2D3D(RefPointer<MAP_T> &mapObj, const DDS_T
const Core::ZReference zReference = data.zReference();
switch (zReference.underlying())
{
case Core::ZReference_def::ZrDrapedOnGround:
case Core::ZReference::ZrDrapedOnGround:
mapObj->setImpacts({origin});
break;
case Core::ZReference_def::ZrUndefined:
case Core::ZReference_def::ZrAbsolute:
case Core::ZReference::ZrUndefined:
case Core::ZReference::ZrAbsolute:
mapObj->setImpactsAbsoluteHeight({origin});
break;
default:
@@ -601,8 +601,8 @@ void ChargeEffectToMap::updateDetonation3D(RefPointer<MAP_T> &mapObj, const DDS_
static QVector<AreaEffectSimulation::AesEffectState_def::type> relevantEffectStates
= {AreaEffectSimulation::AesEffectState_def::EsActivated, AreaEffectSimulation::AesEffectState_def::EsFired, AreaEffectSimulation::AesEffectState_def::EsExpired};
static QVector<AreaEffectSimulation::AesEffectState> relevantEffectStates
= {AreaEffectSimulation::AesEffectState::EsActivated, AreaEffectSimulation::AesEffectState::EsFired, AreaEffectSimulation::AesEffectState::EsExpired};
bDisplay = bDisplay && relevantEffectStates.contains(effectState.underlying());
@@ -621,12 +621,12 @@ void ChargeEffectToMap::updateDetonation3D(RefPointer<MAP_T> &mapObj, const DDS_
switch (zRef.underlying())
{
case Core::ZReference_def::ZrDrapedOnGround:
case Core::ZReference::ZrDrapedOnGround:
if (mapObj->setDetonationsDraped({origin}, std::round(impactRadius)))
bHasChanged = true;
break;
case Core::ZReference_def::ZrUndefined:
case Core::ZReference_def::ZrAbsolute:
case Core::ZReference::ZrUndefined:
case Core::ZReference::ZrAbsolute:
if (mapObj->setDetonationsAbsolute({origin}, std::round(impactRadius)))
bHasChanged = true;
break;
@@ -670,24 +670,24 @@ bool ChargeEffectToMap::visibleByAesFilter(const DDS_T &data) const
switch (data.state().underlying())
{
case AreaEffectSimulation::AesEffectState_def::EsError:
case AreaEffectSimulation::AesEffectState_def::EsUnknown:
case AreaEffectSimulation::AesEffectState_def::EsRemoved:
case AreaEffectSimulation::AesEffectState_def::EsReceived:
case AreaEffectSimulation::AesEffectState_def::EsFired:
case AreaEffectSimulation::AesEffectState::EsError:
case AreaEffectSimulation::AesEffectState::EsUnknown:
case AreaEffectSimulation::AesEffectState::EsRemoved:
case AreaEffectSimulation::AesEffectState::EsReceived:
case AreaEffectSimulation::AesEffectState::EsFired:
DEBUG_LOG(m_logger) << "[visibleByAesFilter] set unvisible id: " << data.id() << ", state:" << data.state();
return false;
case AreaEffectSimulation::AesEffectState_def::EsCreated:
case AreaEffectSimulation::AesEffectState::EsCreated:
DEBUG_LOG(m_logger) << "[visibleByAesFilter][EsCreated] created visible: " << m_effectStateStruct.displayCreated;
return m_effectStateStruct.displayCreated;
case AreaEffectSimulation::AesEffectState_def::EsPrepared:
case AreaEffectSimulation::AesEffectState::EsPrepared:
DEBUG_LOG(m_logger) << "[visibleByAesFilter][EsPrepared] prepared visible? " << m_effectStateStruct.displayPrepared;
return m_effectStateStruct.displayPrepared;
case AreaEffectSimulation::AesEffectState_def::EsActivated:
case AreaEffectSimulation::AesEffectState_def::EsPaused:
case AreaEffectSimulation::AesEffectState::EsActivated:
case AreaEffectSimulation::AesEffectState::EsPaused:
DEBUG_LOG(m_logger) << "[visibleByAesFilter] [active/paused] visible? " << m_effectStateStruct.displayActivated;
return m_effectStateStruct.displayActivated;
case AreaEffectSimulation::AesEffectState_def::EsExpired:
case AreaEffectSimulation::AesEffectState::EsExpired:
{
auto timeTriggered = data.sampleTime();
const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions);
@@ -705,11 +705,11 @@ void ChargeEffectToMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType
{
DEBUG_LOG(m_logger) << "[ChargeEffectToMap] onAesDisplayFilterChanged aes Type: " << aesType;
if (!m_displayFilter
|| ((AreaEffectSimulation::AesType_def::AtExplosionCluster != aesType.underlying())
&& (AreaEffectSimulation::AesType_def::AtExplosionArea != aesType.underlying())))
|| ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType.underlying())
&& (AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying())))
return;
m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType_def::AtExplosionArea);
m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType::AtExplosionArea);
updateAllChargeEffects();
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<DangerArea2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::DangerArea;
using MAP_TYPE = SituationMap::DangerArea;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtDangerArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDangerArea;
};
class DangerArea2SituationMap final : public Aes2SituationMap<DangerArea2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h
+1 -1
View File
@@ -22,7 +22,7 @@ struct Aes2SituationMapTraits<DusSingleMine2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::DusSingleMine;
using MAP_TYPE = SituationMap::Participant;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtDusSingleMine;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDusSingleMine;
};
class DusSingleMine2SituationMap final : public Aes2SituationMap<DusSingleMine2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp
+4 -4
View File
@@ -412,7 +412,7 @@ bool EffectCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2SituationMap
const int chargeTypeId = EffectCluster.chargeStruct().chargeTypeId();
const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(chargeTypeId);
if (gc.underlying() == ProjectDataManagement::GearClass_def::AirSupport)
if (gc.underlying() == ProjectDataManagement::GearClass::AirSupport)
{
const QVector<ProjectDataManagement::CasEffect> &casEffectsVec = m_pdmHandler->casEffects(EffectCluster.chargeStruct());
@@ -537,9 +537,9 @@ void EffectCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation:
TRACE_LOG(m_logger) << " onAesDisplayFilterChanged, aesType =" << aesType
<< ", this " << this;
if ((AreaEffectSimulation::AesType_def::AtEffectCluster != aesType.underlying()) &&
(AreaEffectSimulation::AesType_def::AtExplosionArea != aesType.underlying()) &&
(AreaEffectSimulation::AesType_def::AtAirSupportImpact != aesType.underlying()))
if ((AreaEffectSimulation::AesType::AtEffectCluster != aesType.underlying()) &&
(AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying()) &&
(AreaEffectSimulation::AesType::AtAirSupportImpact != aesType.underlying()))
return;
const auto cb = [this](const DDS_TYPE &data) -> bool
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h
+1 -1
View File
@@ -19,7 +19,7 @@ struct Aes2SituationMapTraits<EffectCluster2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::EffectCluster;
using MAP_TYPE = SituationMap::AreaFire;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtEffectCluster;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtEffectCluster;
};
class EffectCluster2SituationMap final : public Aes2SituationMap<EffectCluster2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<ExplosionArea2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::ExplosionArea;
using MAP_TYPE = SituationMap::AreaFire;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionArea;
};
class ExplosionArea2SituationMap final : public Aes2SituationMap<ExplosionArea2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp
+15 -15
View File
@@ -177,8 +177,8 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS
if (m_displayFilter)
bDisplayFilterShowGTL = m_displayFilter->showExplosionClusterGunToTargetLine();
const bool bDisplayFilterShowGFK = bDisplayFilterShowGTL && bIsMode3D &&
((effectState.underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated) &&
(effectState.underlying() != AreaEffectSimulation::AesEffectState_def::EsExpired));
((effectState.underlying() != AreaEffectSimulation::AesEffectState::EsActivated) &&
(effectState.underlying() != AreaEffectSimulation::AesEffectState::EsExpired));
@@ -420,18 +420,18 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation
for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef))
{
if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered)
if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
continue;
switch (se.zPlacement().underlying())
{
case AreaEffectSimulation::AesZPlacement_def::ZpDraped:
case AreaEffectSimulation::AesZPlacement::ZpDraped:
posContImpactsDraped.append({se.position().lon(), se.position().lat(), se.position().z()});
break;
case AreaEffectSimulation::AesZPlacement_def::ZpAbsolute:
case AreaEffectSimulation::AesZPlacement::ZpAbsolute:
posContImpactsAbsolute.append({se.position().lon(), se.position().lat(), se.position().z()});
break;
case AreaEffectSimulation::AesZPlacement_def::ZpRelative:
case AreaEffectSimulation::AesZPlacement::ZpRelative:
break;
}
@@ -544,7 +544,7 @@ bool ExplosionCluster2SituationMap::updateNonLethalArea(RefPointer<Sim2Situation
const int chargeTypeId = explosionCluster.chargeStruct().chargeTypeId();
const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(chargeTypeId);
if (gc.underlying() == ProjectDataManagement::GearClass_def::AirSupport)
if (gc.underlying() == ProjectDataManagement::GearClass::AirSupport)
{
const QVector<ProjectDataManagement::CasEffect> &casEffectsVec = m_pdmHandler->casEffects(explosionCluster.chargeStruct());
@@ -721,7 +721,7 @@ bool ExplosionCluster2SituationMap::updateAllTracjectories(int simToRestrict)
bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSimulation::Effects &effects)
{
if (effects.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions)
if (effects.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)
return false;
const int32_t simId = effects.aesItemId();
@@ -767,7 +767,7 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
{
++i;
if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered)
if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState::SesTriggered)
continue;
const qint64 age = partitionTimeMsec - se.singleEffectTime();
@@ -782,13 +782,13 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi
switch (se.zPlacement().underlying())
{
case AreaEffectSimulation::AesZPlacement_def::ZpDraped:
case AreaEffectSimulation::AesZPlacement::ZpDraped:
posContImpactsDraped.append({singleEffectPosGeo.lon(), singleEffectPosGeo.lat(), singleEffectPosGeo.z()});
break;
case AreaEffectSimulation::AesZPlacement_def::ZpAbsolute:
case AreaEffectSimulation::AesZPlacement::ZpAbsolute:
posContImpactsAbsolute.append({singleEffectPosGeo.lon(), singleEffectPosGeo.lat(), singleEffectPosGeo.z()});
break;
case AreaEffectSimulation::AesZPlacement_def::ZpRelative:
case AreaEffectSimulation::AesZPlacement::ZpRelative:
break;
}
@@ -939,9 +939,9 @@ void ExplosionCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulati
TRACE_LOG(m_logger) << "START onAesDisplayFilterChanged, aesType =" << aesType
<< ", this " << this;
if ((AreaEffectSimulation::AesType_def::AtExplosionCluster != aesType.underlying()) &&
(AreaEffectSimulation::AesType_def::AtExplosionArea != aesType.underlying()) &&
(AreaEffectSimulation::AesType_def::AtAirSupportImpact != aesType.underlying()))
if ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType.underlying()) &&
(AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying()) &&
(AreaEffectSimulation::AesType::AtAirSupportImpact != aesType.underlying()))
return;
const auto cb = [this](const DDS_TYPE &data) -> bool
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h
+1 -1
View File
@@ -19,7 +19,7 @@ struct Aes2SituationMapTraits<ExplosionCluster2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::ExplosionCluster;
using MAP_TYPE = SituationMap::AreaFire;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionCluster;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionCluster;
};
class ExplosionCluster2SituationMap final : public Aes2SituationMap<ExplosionCluster2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h
+1 -1
View File
@@ -18,7 +18,7 @@ struct Aes2SituationMapTraits<ExplosionSingle2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::ExplosionSingle;
using MAP_TYPE = SituationMap::SingleFire;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionSingle;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionSingle;
};
class ExplosionSingle2SituationMap final : public Aes2SituationMap<ExplosionSingle2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct Aes2SituationMapTraits<FunctionalArea2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::FunctionalArea;
using MAP_TYPE = SituationMap::FunctionalArea;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtFunctionalArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtFunctionalArea;
};
class FunctionalArea2SituationMap final : public Aes2SituationMap<FunctionalArea2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<GasPipe2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::GasPipe;
using MAP_TYPE = SituationMap::Polygon;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtGasPipe;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtGasPipe;
};
class GasPipe2SituationMap final : public Aes2SituationMap<GasPipe2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp
+15 -15
View File
@@ -67,7 +67,7 @@ bool GuezIed2SituationMap::init(PluginProvider *pluginProvider)
m_displayFilter->addChangedCallback(this);
}
onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtMineAreaSingleMines);
onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtMineAreaSingleMines);
connect(m_pluginProvider, &PluginProvider::partitionTimeChanged,
this, &GuezIed2SituationMap::partitionTimeChanged);
@@ -100,7 +100,7 @@ bool GuezIed2SituationMap::run()
onIedPositionChanged(data, DataModification::eAdded);
});
onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtMineAreaSingleMines);
onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtMineAreaSingleMines);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
return true;
@@ -300,8 +300,8 @@ bool GuezIed2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsD
AdvancedSymbology::Injury injury = guezIedStateToInjury(ddsData.tacticalState());
if ((ddsData.type() == GuezIedManagement::IedType_def::IedSmallPyro) ||
(ddsData.type() == GuezIedManagement::IedType_def::IedBigPyro))
if ((ddsData.type() == GuezIedManagement::IedType::IedSmallPyro) ||
(ddsData.type() == GuezIedManagement::IedType::IedBigPyro))
{
updateIedPyro(ddsData.tacticalState(), injury, symData.sidc);
}
@@ -336,10 +336,10 @@ void GuezIed2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesTy
{
DEBUG_LOG(m_logger) << "GuezIed2SituationMap";
if (!m_displayFilter || aesType != AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
if (!m_displayFilter || aesType != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
return;
m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType_def::AtMineAreaSingleMines);
m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType::AtMineAreaSingleMines);
handleSymbolAppearanceSettings();
@@ -438,19 +438,19 @@ bool GuezIed2SituationMap::visibleByAesFilter(const Sim2SituationMap::DDS_T &dds
case GuezIedManagement::IedTacticalState_def::NotActive:
case GuezIedManagement::IedTacticalState::NotActive:
return m_effectStateStruct.displayPrepared;
case GuezIedManagement::IedTacticalState_def::Active:
case GuezIedManagement::IedTacticalState::Active:
return m_effectStateStruct.displayActivated;
case GuezIedManagement::IedTacticalState_def::Unknown:
case GuezIedManagement::IedTacticalState::Unknown:
return false;
case GuezIedManagement::IedTacticalState_def::Defused:
case GuezIedManagement::IedTacticalState_def::TriggeredByControlDevice:
case GuezIedManagement::IedTacticalState_def::TriggeredByLightBarrier:
case GuezIedManagement::IedTacticalState_def::TriggeredByRemote:
case GuezIedManagement::IedTacticalState_def::TriggeredBySwitch:
case GuezIedManagement::IedTacticalState_def::TriggeredByTautWire:
case GuezIedManagement::IedTacticalState::Defused:
case GuezIedManagement::IedTacticalState::TriggeredByControlDevice:
case GuezIedManagement::IedTacticalState::TriggeredByLightBarrier:
case GuezIedManagement::IedTacticalState::TriggeredByRemote:
case GuezIedManagement::IedTacticalState::TriggeredBySwitch:
case GuezIedManagement::IedTacticalState::TriggeredByTautWire:
auto timeTriggered = ddsData.sampleTime();
const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtMineAreaSingleMines);
const auto afterGlow = m_effectStateStruct.expiredAfterglowDurationMSec;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp
+3 -3
View File
@@ -223,7 +223,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
bool DusMineStateProxy::getItemView(AreaEffectSimulation::AesItemView &itemView)
{
int aesType = static_cast<int>(AreaEffectSimulation::AesType::inner_enum::AtMineAreaSingleMines);
int aesType = static_cast<int>(AreaEffectSimulation::AesType::AtMineAreaSingleMines);
const AreaEffectSimulation::AesItemView &localItemView = m_aesDtc->aesItemView(aesType);
@@ -295,7 +295,7 @@ bool MineAreaNull2SituationMap::mapObjectsClicked(const QVector<UniqueMapId> &un
if (simIds.isEmpty())
return true;
sp->showInfoWindow(simIds, AreaEffectSimulation::AesType_def::AtMineAreaSingleMines);
sp->showInfoWindow(simIds, AreaEffectSimulation::AesType::AtMineAreaSingleMines);
return true;
}
@@ -360,7 +360,7 @@ void MineAreaNull2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::
{
if (AreaEffectSimulation::AesType_def::AtMineArea != aesType.underlying())
if (AreaEffectSimulation::AesType::AtMineArea != aesType.underlying())
return;
const auto cb = [this](const DDS_TYPE &data) -> bool
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
+2 -2
View File
@@ -60,7 +60,7 @@ public:
static PartyId partyId() { return {}; }
static bool isCentral() { return false;}
static AreaEffectSimulation::AesEffectState effectStateId() { return AreaEffectSimulation::AesEffectState_def::EsCreated;}
static AreaEffectSimulation::AesEffectState effectStateId() { return AreaEffectSimulation::AesEffectState::EsCreated;}
AreaEffectSimulation::ChargeStruct chargeStruct() const { return m_chargeStruct; }
int chargeTypeId() const { return m_chargeStruct.chargeTypeId(); }
@@ -168,7 +168,7 @@ struct Aes2SituationMapTraits<MineAreaNull2SituationMap>
{
using DDS_TYPE = DusMineStateAndPositionData;
using MAP_TYPE = SituationMap::Participant;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtMineArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineArea;
};
class MineAreaNull2SituationMap final : public Aes2SituationMap<MineAreaNull2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ bool MineArea2SituationMap::updateVisibility(const DDS_TYPE &data, RefPointer<MA
bool bDisplayFilterShowDetails = true;
if (m_displayFilter)
bDisplayFilterShowDetails = m_displayFilter->showDetails(AreaEffectSimulation::AesType_def::AtMineArea);
bDisplayFilterShowDetails = m_displayFilter->showDetails(AreaEffectSimulation::AesType::AtMineArea);
const bool bShowDetails = mapObj->visibility() && bDisplayFilterShowDetails;
bool bUpdateView = false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<MineArea2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::MineArea;
using MAP_TYPE = SituationMap::MineField;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtMineArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineArea;
};
class MineArea2SituationMap final : public Aes2SituationMap<MineArea2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<MineCorridor2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::MineCorridor;
using MAP_TYPE = SituationMap::Polygon;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtMineCorridor;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineCorridor;
};
class MineCorridor2SituationMap final : public Aes2SituationMap<MineCorridor2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp
+33 -33
View File
@@ -170,7 +170,7 @@ bool MountingPointToMap::initRendererInternal()
SituationMap::LayerFactory::UniqueValueData uvd;
QMap<InfrastructureManagement::MountingPointType_def::type, InfrastructureManagement::MountingPoint::MpNameImageData> &imageCont =
QMap<InfrastructureManagement::MountingPointType, InfrastructureManagement::MountingPoint::MpNameImageData> &imageCont =
InfrastructureManagement::MountingPoint::getImageTable();
@@ -507,26 +507,26 @@ bool MountingPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
switch (m_resourceManagerMode) {
case ResourceManagerMode::RMM_PlanActivityView:
return ( (mpType.underlying() == InfrastructureManagement::MountingPointType_def::BuildingControlUnit) ||
(data.aimState().underlying() == InfrastructureManagement::MountingPointState_def::Idle)
return ( (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingControlUnit) ||
(data.aimState().underlying() == InfrastructureManagement::MountingPointState::Idle)
);
break;
case ResourceManagerMode::RMM_PlanDefinitionView:
return (mpType.underlying() == InfrastructureManagement::MountingPointType_def::BuildingControlUnit);
return (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingControlUnit);
break;
case ResourceManagerMode::RMM_ComponentMonitor:
return
! (data.hasAssociatedAsset() &&
(
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorIPS) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::IndoorIPS) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorCamera) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::IndoorCamera) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorCamera) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::BuildingSensorModule)
(mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorIPS) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorIPS) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorCamera) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingSensorModule)
)
);
break;
@@ -608,8 +608,8 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat
InfrastructureManagement::MountingPoint::MpColor col = InfrastructureManagement::MountingPoint::MpColor::GRAY;
const InfrastructureManagement::MountingPointType mpType = ddsData.type();
if ( (mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorIPS) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType_def::IndoorIPS) )
if ( (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorIPS) ||
(mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorIPS) )
{
col = InfrastructureManagement::MountingPoint::MpColor::GRAY;
} else {
@@ -622,16 +622,16 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat
DEBUG_LOG(m_logger) << LOGFUNCTION << " componentStateOfHostname: '" << hostname << "' -> " << stateOut;
switch (stateOut.underlying()) {
case ComponentMonitor::ComponentState_def::Undefined:
case ComponentMonitor::ComponentState::Undefined:
if (QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier))
col = InfrastructureManagement::MountingPoint::MpColor::ORANGE;
else
col = InfrastructureManagement::MountingPoint::MpColor::RED;
break;
case ComponentMonitor::ComponentState_def::Reachable:
case ComponentMonitor::ComponentState::Reachable:
col = InfrastructureManagement::MountingPoint::MpColor::GREEN;
break;
case ComponentMonitor::ComponentState_def::Unreachable:
case ComponentMonitor::ComponentState::Unreachable:
col = InfrastructureManagement::MountingPoint::MpColor::RED;
break;
default:
@@ -703,7 +703,7 @@ void MountingPointToMap::handleBuildingComponentSettingsMP(RefPointer<Sim2Situat
if (!mapObj.valid())
return;
const InfrastructureManagement::MountingPointType_def::type type = mountingPoint.type().underlying();
const InfrastructureManagement::MountingPointType type = static_cast<InfrastructureManagement::MountingPointType>(mountingPoint.type());
bool newVisi = showMountingPointType(type);
if (newVisi)
{
@@ -724,62 +724,62 @@ void MountingPointToMap::handleBuildingComponentSettingsMP(RefPointer<Sim2Situat
}
}
bool MountingPointToMap::showMountingPointType(InfrastructureManagement::MountingPointType_def::type mpType) const
bool MountingPointToMap::showMountingPointType(InfrastructureManagement::MountingPointType mpType) const
{
const FilterManagement::BuildingComponentSettings::BldCmpSettings::ComponentSettings &cs =
m_currentBuildingComponentSettings.componentSettings;
switch (mpType) {
case InfrastructureManagement::MountingPointType_def::AnnouncementUnit:
case InfrastructureManagement::MountingPointType::AnnouncementUnit:
#ifdef GUEZ_MODE
return false;
#else
return cs.showAnnouncementUnit;
#endif
break;
case InfrastructureManagement::MountingPointType_def::BuildingControlUnit:
case InfrastructureManagement::MountingPointType::BuildingControlUnit:
return cs.showBuildingControlUnit;
break;
case InfrastructureManagement::MountingPointType_def::BuildingNetworkSwitch:
case InfrastructureManagement::MountingPointType::BuildingNetworkSwitch:
#ifdef GUEZ_MODE
return false;
#else
return cs.showBuildingNetworkSwitch;
#endif
break;
case InfrastructureManagement::MountingPointType_def::BuildingSensorModule:
case InfrastructureManagement::MountingPointType::BuildingSensorModule:
return cs.showBuildingSensorModule;
break;
case InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit:
case InfrastructureManagement::MountingPointType::EffectGenerationControlUnit:
return cs.showEffectGenerationControlUnit;
break;
case InfrastructureManagement::MountingPointType_def::IndoorCamera:
case InfrastructureManagement::MountingPointType::IndoorCamera:
return cs.showIndoorCamera;
break;
case InfrastructureManagement::MountingPointType_def::IndoorIPS:
case InfrastructureManagement::MountingPointType::IndoorIPS:
return cs.showIndoorIPS;
break;
case InfrastructureManagement::MountingPointType_def::MeteoDataUnit:
case InfrastructureManagement::MountingPointType::MeteoDataUnit:
return cs.showMeteoDataUnit;
break;
case InfrastructureManagement::MountingPointType_def::OutdoorCamera:
case InfrastructureManagement::MountingPointType::OutdoorCamera:
return cs.showOutdoorCamera;
break;
case InfrastructureManagement::MountingPointType_def::OutdoorControlUnit:
case InfrastructureManagement::MountingPointType::OutdoorControlUnit:
#ifdef GUEZ_MODE
return false;
#else
return cs.showOutdoorControlUnit;
#endif
break;
case InfrastructureManagement::MountingPointType_def::OutdoorIPS:
case InfrastructureManagement::MountingPointType::OutdoorIPS:
return cs.showOutdoorIPS;
break;
case InfrastructureManagement::MountingPointType_def::VirtualIPS:
case InfrastructureManagement::MountingPointType::VirtualIPS:
return cs.showVirtualIPS;
break;
case InfrastructureManagement::MountingPointType_def::Unknown:
WARNING_LOG(m_logger) << LOGFUNCTION << " visibility of MountingPointType_def::Unknown - unwanted, most likelky an error...";
case InfrastructureManagement::MountingPointType::Unknown:
WARNING_LOG(m_logger) << LOGFUNCTION << " visibility of MountingPointType::Unknown - unwanted, most likelky an error...";
#ifdef LTS_DEBUG
Q_ASSERT(false);
#endif
@@ -821,7 +821,7 @@ std::string MountingPointToMap::mountingPointHostname(const InfrastructureManage
bool MountingPointToMap::componentStateOfHostname(const std::string &hostname, ComponentMonitor::ComponentState &stateOut)
{
stateOut = ComponentMonitor::ComponentState(ComponentMonitor::ComponentState_def::Undefined);
stateOut = ComponentMonitor::ComponentState(ComponentMonitor::ComponentState::Undefined);
if (!m_cmoDtc)
return false;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.h
+1 -1
View File
@@ -86,7 +86,7 @@ protected:
void handleBuildingComponentSettings(RefPointer<MAP_T> &mapObj) override;
void handleBuildingComponentSettingsMP(RefPointer<MAP_T> &mapObj,
const InfrastructureManagement::MountingPoint &mountingPoint);
bool showMountingPointType(InfrastructureManagement::MountingPointType_def::type mpType) const;
bool showMountingPointType(InfrastructureManagement::MountingPointType mpType) const;
#endif
private:
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ bool NContamination2SituationMap::updateSphere3D(RefPointer<Sim2SituationMap::MA
bool bUpdateRequired = false;
const bool bDesiredNewState = (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsActivated) &&
const bool bDesiredNewState = (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsActivated) &&
((newPartitionTime - data.sampleTime() < 5000));
TRACE_LOG(m_logger) << LOGFUNCTION << ", START" << " simId = " << simId
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<NContamination2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::NContamination;
using MAP_TYPE = SituationMap::NuclearAgent;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtNContamination;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtNContamination;
};
class NContamination2SituationMap final : public Aes2SituationMap<NContamination2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.cpp
+3 -3
View File
@@ -339,7 +339,7 @@ bool OffRoute2SituationMap::isVisibleByFilter(const Aes2SituationMap::DDS_TYPE &
const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1;
bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true;
if (isVisibleByFilter)
isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType_def::AtMineArea,
isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType::AtMineArea,
data.effectStateId(),
data.chargeStruct().chargeTypeId(),
partyId,
@@ -353,8 +353,8 @@ bool OffRoute2SituationMap::isVisibleByFilter(const Aes2SituationMap::DDS_TYPE &
void OffRoute2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
{
if ((AreaEffectSimulation::AesType_def::AtOffRouteMine != aesType.underlying()) &&
(AreaEffectSimulation::AesType_def::AtMineArea != aesType.underlying()))
if ((AreaEffectSimulation::AesType::AtOffRouteMine != aesType.underlying()) &&
(AreaEffectSimulation::AesType::AtMineArea != aesType.underlying()))
return;
const auto cb = [this](const DDS_TYPE &data) -> bool
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/off_route_to_map.h
+1 -1
View File
@@ -29,7 +29,7 @@ struct Aes2SituationMapTraits<OffRoute2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::OffRouteMine;
using MAP_TYPE = SituationMap::VirtualMine;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtOffRouteMine;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtOffRouteMine;
};
class OffRoute2SituationMap final : public Aes2SituationMap<OffRoute2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/participant_to_map.cpp
+25 -25
View File
@@ -334,9 +334,9 @@ bool Participant2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Uni
{
const ParticipantManagement::Type type = m_ppmDtc->type(particpantData.typeId());
const ParticipantManagement::TypeClass typeClass = type.typeClass();
const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass_def::Human ?
ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries :
ProjectDataManagement::VulnerabilityClass_def::VehicleDamages;
const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ?
ProjectDataManagement::VulnerabilityClass::SoldierInjuries :
ProjectDataManagement::VulnerabilityClass::VehicleDamages;
const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(dynData.stateHistory());
const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
@@ -863,9 +863,9 @@ void Participant2SituationMap::onAesItemViewChanged(const AreaEffectSimulation::
static QVector<AreaEffectSimulation::AesType::inner_enum> subOrdinateAesTypeIds = {AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions,
AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory,
AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine};
static QVector<AreaEffectSimulation::AesType> subOrdinateAesTypeIds = {AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions,
AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory,
AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine};
if (subOrdinateAesTypeIds.contains(data.aesTypeId().underlying()))
return;
@@ -1079,35 +1079,35 @@ bool Participant2SituationMap::updateDynamicParticipantData(RefPointer<Sim2Situa
const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState();
switch (vulState.underlying())
{
case ProjectDataManagement::VulnerabilityState::CombatReady:
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
case ProjectDataManagement::VulnerabilityState::NearMiss:
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
case ProjectDataManagement::VulnerabilityState::Reserved:
case ProjectDataManagement::VulnerabilityState::NoChange:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_Reserved:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange:
injury = SituationMap::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:
injury = SituationMap::Injury::Hit;
break;
case ProjectDataManagement::VulnerabilityState::MobilityKill:
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
injury = SituationMap::Injury::MobilityKill;
break;
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage:
injury = SituationMap::Injury::WeaponKill;
break;
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill:
injury = SituationMap::Injury::TotalKill;
break;
case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged:
case ProjectDataManagement::VulnerabilityState::NContamination:
case ProjectDataManagement::VulnerabilityState::BContamination:
case ProjectDataManagement::VulnerabilityState::CContamination:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NContamination:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_BContamination:
case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination:
injury = SituationMap::Injury::Hit;
break;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ bool PdmHandler::isChargeTypeLtdOrLrf(SpecialChargeType sct)
ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int chargeTypeId)
{
if (!m_dtcPdm)
return ProjectDataManagement::GearClass_def::Unknown;
return ProjectDataManagement::GearClass::Unknown;
return m_dtcPdm->gearClassFromChargeTypeId(chargeTypeId);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/recon_area_to_map.h
+1 -1
View File
@@ -19,7 +19,7 @@ struct Aes2SituationMapTraits<ReconArea2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::ReconArea;
using MAP_TYPE = SituationMap::BiologicalAgent;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtReconArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtReconArea;
};
class ReconArea2SituationMap final : public Aes2SituationMap<ReconArea2SituationMap>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct Aes2SituationMapTraits<TechnicalArea2SituationMap>
{
using DDS_TYPE = AreaEffectSimulation::TechnicalArea;
using MAP_TYPE = SituationMap::Polygon;
static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtTechnicalArea;
static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtTechnicalArea;
};
class TechnicalArea2SituationMap final : public Aes2SituationMap<TechnicalArea2SituationMap>