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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp
+19 -19
View File
@@ -62,29 +62,29 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
if (modType != DataModification::eAdded &&
modType != DataModification::eModified)
{
m_explosionSingleState.remove(data.id());
m_explosionSingleState.remove(data.id);
return;
}
if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
{
DEBUG_LOG(m_logger) << "Remove SingleExplosion";
m_explosionSingleState.remove(data.id());
m_explosionSingleState.remove(data.id);
return;
}
// Only handle transitions from prepared or fired to activated
if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared ||
m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsFired) &&
data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
if ((m_explosionSingleState.value(data.id) == AreaEffectSimulation::AesEffectState::EsPrepared ||
m_explosionSingleState.value(data.id) == AreaEffectSimulation::AesEffectState::EsFired) &&
data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
{
DEBUG_LOG(m_logger) << "Handle SingleExplosion";
handleExplosion = true;
}
m_explosionSingleState.insert(data.id(), data.effectStateId());
m_explosionSingleState.insert(data.id, data.effectStateId);
DEBUG_LOG(m_logger) << "Got ExplosionSingle State=" << data.effectStateId()
<< " id=" << data.id();
DEBUG_LOG(m_logger) << "Got ExplosionSingle State=" << data.effectStateId
<< " id=" << data.id;
if (handleExplosion)
{
DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated) HandlerArtillerieSound";
@@ -107,7 +107,7 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
<< "/" << i.value().positionUtm.y()
<< " zone=" << i.value().zone;
// Calculate the distance between the speaker and the explosion
const QPointF posExplosionUtm = CentralEffectSimulation::geographic2Utm(data.impactPosition(), i.value().zone);
const QPointF posExplosionUtm = CentralEffectSimulation::geographic2Utm(data.impactPosition, i.value().zone);
const qreal distance = qSqrt(qPow(posExplosionUtm.x() - i.value().positionUtm.x(), 2) + qPow(posExplosionUtm.y() - i.value().positionUtm.y(), 2));
int sound = Settings::cesSoundId();
const qreal distanceThreshold = Settings::cesDistanceThreshold(); // [m]
@@ -193,24 +193,24 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation::
if (modType != DataModification::eAdded &&
modType != DataModification::eModified)
{
m_technicalAreas.remove(data.id());
m_technicalAreas.remove(data.id);
return;
}
if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
{
DEBUG_LOG(m_logger) << "Remove TechnicalArea";
m_technicalAreas.remove(data.id());
m_technicalAreas.remove(data.id);
return;
}
if (data.type() == AreaEffectSimulation::AesTechnicalAreaType::TatSoundZone)
if (data.type == AreaEffectSimulation::AesTechnicalAreaType::TatSoundZone)
{
int zone = -1;
m_technicalAreas.insert(data.id(), data);
DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id();
QPointF cornerButtomLeft = CentralEffectSimulation::geographic2Utm(data.area().cornerBottomLeft(), &zone);
qreal x = cornerButtomLeft.x() + data.area().width() / 2;
qreal y = cornerButtomLeft.y() + data.area().height() / 2;
m_technicalAreas.insert(data.id, data);
DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id;
QPointF cornerButtomLeft = CentralEffectSimulation::geographic2Utm(data.area.cornerBottomLeft, &zone);
qreal x = cornerButtomLeft.x() + data.area.width / 2;
qreal y = cornerButtomLeft.y() + data.area.height / 2;
QPointF center(x, y);
DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound cornerButtomLeft = " << cornerButtomLeft.x() << "/" << cornerButtomLeft.y()
<< " zone=" << zone;