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

Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes

Browse Source 
- Merged 292 changed files from dlbo snapshot
- Fixed IDL enum collisions (PortType, PdmEventType)
- Fixed Grantlee template for C++11 scoped enums
- Fixed CMake VERSION_GREATER syntax
- Added missing directories (THP, LtsRestClient, etc.)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-09-15 18:20:51 +00:00
1 parent c9e245a211
commit 3028302f7b
310 files changed
+2823 -740
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp
+16 -3
View File
@@ -115,7 +115,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
// if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass_def::AirSupport)
// return;
static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster};
static const QVector<AreaEffectSimulation::AesType> validAesTypes = {AesType_def::AtEffectCluster, AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster};
if (!validAesTypes.contains(data.aesTypeId()))
return;
@@ -159,6 +159,12 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
DEBUG_LOG(m_logger) << "explosionCluster";
break;
}
case AreaEffectSimulation::AesType::AtEffectCluster:
{
isCentral = true;
DEBUG_LOG(m_logger) << "effectCluster";
break;
}
default:
DEBUG_LOG(m_logger) << "default, data.aesTypeId=" << aesTypeId;
} // switch
@@ -268,7 +274,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
// a) Aiv changes to EsActivated or
// b) Effects ?
// So be prepared and calculate hazardDistanceForm already at EsPrepared
if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster)
if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster || aesTypeId == AreaEffectSimulation::AesType_def::AtEffectCluster)
{
// useHazardDistance = (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster);
@@ -384,7 +390,10 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
requestTab.equipmentNumber(equipNo);
requestTab.participantId(pPos.participantId());
requestTab.chargeTypeId(data.chargeTypeId());
//default
requestTab.aesId(0);
requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent);
//
if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Participant)
{
// if we get the equipmentNumber from the participant we will send this (needed by tab)
@@ -402,10 +411,14 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
{
requestTab.originatorEquipmentNumber(data.originatorId());
}
else if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
{
requestTab.aesId(data.originatorId());
requestTab.eventType(ProjectDataManagement::EventType_def::ExplosionCluster);
}
requestTab.remainEffectPercent(remainEffectPercent);
requestTab.position(tabPosition);
requestTab.effectTime(data.effectStart() / 1000);
requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent);
ParticipantManagement::Participant originator = m_ddsHandler->dtcPpm()->participant(data.originatorId());
requestTab.partyId(originator.partyId());
requestTab.mineId(0);