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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
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
+11 -12
View File
@@ -19,7 +19,6 @@ EffectShowEffectCluster::EffectShowEffectCluster(const AreaEffectSimulation::Eff
: m_effectCluster(effectCluster)
, m_handlerPdmData(handlerPdmData)
, m_numOfEffectShows(0)
, m_logger(getLogger("EffectShowEffectCluster"))
{
}
@@ -83,7 +82,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
if (esmEffectShow.shotsPerVolley <= 0)
esmEffectShow.shotsPerVolley = 1;
DEBUG_LOG(m_logger) << "recalc effectDuration ";
DEBUG_LOG() << "recalc effectDuration ";
if (m_effectCluster.effectDuration() == DEFAULT_EFFECT_DURATION)
{
@@ -95,7 +94,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
{
//use default
esmEffectShow.duration = Settings::getDefaultCadence() * esmEffectShow.shotsPerVolley;
DEBUG_LOG(m_logger) << " recalc effectDuration use default value as fireoncommand " << esmEffectShow.duration ;
DEBUG_LOG() << " recalc effectDuration use default value as fireoncommand " << esmEffectShow.duration ;
}
else
{
@@ -103,13 +102,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(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());
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());
}
}
}
else
{
DEBUG_LOG(m_logger) << "Use effectDuration directly ";
DEBUG_LOG() << "Use effectDuration directly ";
esmEffectShow.duration = m_effectCluster.effectDuration();
}
esmEffectShow.lowerLeftPosition = lowerLeftPosRotated.geographic();
@@ -118,7 +117,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
esmEffectShow.areaRotation = m_effectCluster.area().rotation() + 90;
DEBUG_LOG(m_logger) << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
DEBUG_LOG() << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
<< "\nduration: " << esmEffectShow.duration
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
@@ -156,7 +155,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
esmEffectShow.areaDepth = m_effectCluster.area().height();
esmEffectShow.areaRotation = m_effectCluster.area().rotation() + 90;
DEBUG_LOG(m_logger) << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
DEBUG_LOG() << "\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();
@@ -168,12 +167,12 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
{
DEBUG_LOG(m_logger) << "update EffectSHow for (" << data.id << ")";
DEBUG_LOG() << "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(m_logger) << "Recalc effectDuration ";
DEBUG_LOG() << "Recalc effectDuration ";
if (m_effectCluster.effectDuration() == DEFAULT_EFFECT_DURATION)
{
@@ -185,7 +184,7 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
{
//use default
data.duration = Settings::getDefaultCadence() * data.shotsPerVolley;
DEBUG_LOG(m_logger) << " recalc effectDuration use default value as fireoncommand " << data.duration ;
DEBUG_LOG() << " recalc effectDuration use default value as fireoncommand " << data.duration ;
}
else
{
@@ -193,13 +192,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(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());
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());
}
}
}
else
{
DEBUG_LOG(m_logger) << "Use effectDuration directly ";
DEBUG_LOG() << "Use effectDuration directly ";
data.duration = m_effectCluster.effectDuration();
}