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

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp
+14 -15
View File
@@ -15,11 +15,10 @@ const static int DEFAULT_EFFECT_DURATION = 777777;
namespace EffectShowManagement
{
EffectShowEffectCluster::EffectShowEffectCluster(const AreaEffectSimulation::EffectCluster &effectCluster,
const std::shared_ptr<HandlerPdmData> &handlerPdmData)
: m_effectCluster(effectCluster)
const std::shared_ptr<HandlerPdmData> &handlerPdmData) : m_effectCluster(effectCluster)
, m_handlerPdmData(handlerPdmData)
, m_numOfEffectShows(0)
{
, m_numOfEffectShows(0),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
}
//=============================================================================
@@ -82,7 +81,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
if (esmEffectShow.shotsPerVolley <= 0)
esmEffectShow.shotsPerVolley = 1;
DEBUG_LOG() << "recalc effectDuration ";
DEBUG_LOG(m_logger) << "recalc effectDuration ";
if (m_effectCluster.effectDuration() == DEFAULT_EFFECT_DURATION)
{
@@ -94,7 +93,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
{
//use default
esmEffectShow.duration = Settings::getDefaultCadence() * esmEffectShow.shotsPerVolley;
DEBUG_LOG() << " recalc effectDuration use default value as fireoncommand " << esmEffectShow.duration ;
DEBUG_LOG(m_logger) << " recalc effectDuration use default value as fireoncommand " << esmEffectShow.duration ;
}
else
{
@@ -102,13 +101,13 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
if (m_effectCluster.effectors().size()) //should always be there!
{
esmEffectShow.duration = m_effectCluster.effectors().at(0).chargeAmount() * m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
DEBUG_LOG() << " recalc effectDuration use cadence value " << esmEffectShow.duration << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
DEBUG_LOG(m_logger) << " recalc effectDuration use cadence value " << esmEffectShow.duration << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
}
}
}
else
{
DEBUG_LOG() << "Use effectDuration directly ";
DEBUG_LOG(m_logger) << "Use effectDuration directly ";
esmEffectShow.duration = m_effectCluster.effectDuration();
}
esmEffectShow.lowerLeftPosition = lowerLeftPosRotated.geographic();
@@ -117,7 +116,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
esmEffectShow.areaRotation = m_effectCluster.area().rotation() + 90;
DEBUG_LOG() << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
DEBUG_LOG(m_logger) << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
<< "\nduration: " << esmEffectShow.duration
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
@@ -155,7 +154,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
esmEffectShow.areaDepth = m_effectCluster.area().height();
esmEffectShow.areaRotation = m_effectCluster.area().rotation() + 90;
DEBUG_LOG() << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
DEBUG_LOG(m_logger) << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
<< "\nSide x,y: " << m_effectCluster.area().width() << " , " << m_effectCluster.area().height();
@@ -167,12 +166,12 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
{
DEBUG_LOG() << "update EffectSHow for (" << data.id << ")";
DEBUG_LOG(m_logger) << "update EffectSHow for (" << data.id << ")";
data.nameAreaEfffectSimulation = QString::fromStdString(m_effectCluster.name());
data.startTime = m_effectCluster.effectStart().is_set() ? m_effectCluster.effectStart().get() : 0;
DEBUG_LOG() << "Recalc effectDuration ";
DEBUG_LOG(m_logger) << "Recalc effectDuration ";
if (m_effectCluster.effectDuration() == DEFAULT_EFFECT_DURATION)
{
@@ -184,7 +183,7 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
{
//use default
data.duration = Settings::getDefaultCadence() * data.shotsPerVolley;
DEBUG_LOG() << " recalc effectDuration use default value as fireoncommand " << data.duration ;
DEBUG_LOG(m_logger) << " recalc effectDuration use default value as fireoncommand " << data.duration ;
}
else
{
@@ -192,13 +191,13 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
if (m_effectCluster.effectors().size()) //should always be there!
{
data.duration = m_effectCluster.effectors().at(0).chargeAmount() * m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
DEBUG_LOG() << " recalc effectDuration use cadence value " << data.duration << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
DEBUG_LOG(m_logger) << " recalc effectDuration use cadence value " << data.duration << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
}
}
}
else
{
DEBUG_LOG() << "Use effectDuration directly ";
DEBUG_LOG(m_logger) << "Use effectDuration directly ";
data.duration = m_effectCluster.effectDuration();
}