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/object_effect_show.cpp
+13 -14
View File
@@ -16,7 +16,6 @@ namespace EffectShowManagement
ObjectEffectShow::ObjectEffectShow(Initialization *mainHandler, QObject *parent)
: QObject(parent)
, m_mainHandler(mainHandler)
, m_logger(getLogger("ObjectEffectShow"))
{
} // end of ctor()
//=============================================================================
@@ -40,7 +39,7 @@ Core::FunctionReplyObject ObjectEffectShow::createObject(const Database::EsmEffe
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShow into database"));
}
DEBUG_LOG(m_logger) << "createObject(db) complete ->"
DEBUG_LOG() << "createObject(db) complete ->"
<< "\n id " << m_data.id
<< "\n centerPosition " << LtsCoordTrans::mgrsFromGeographic(m_data.centerPosition.x(), m_data.centerPosition.y())
<< "\n idAreaEffectSimulation " << m_data.idAreaEffectSimulation
@@ -80,7 +79,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
if (m_data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution)
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Changes rejected due to Effect Show in execution."));
DEBUG_LOG(m_logger) << "updateObject(data topic) complete ->"
DEBUG_LOG() << "updateObject(data topic) complete ->"
<< "\n id " << m_data.id << " new: " << data.id()
<< "\n centerPosition x " << m_data.centerPosition.x() << " new: " << data.position().lon()
<< "\n centerPosition y " << m_data.centerPosition.y() << " new: " << data.position().lat()
@@ -121,7 +120,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
if (!m_mainHandler->db()->update(m_data))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShow into database"));
DEBUG_LOG(m_logger) << "Data changed for EffectShow Id: " << m_data.id;
DEBUG_LOG() << "Data changed for EffectShow Id: " << m_data.id;
// Publish Data via DTS
onPublishData();
@@ -131,7 +130,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
//=============================================================================
bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &data)
{
DEBUG_LOG(m_logger) << "updateObject() partly ->"
DEBUG_LOG() << "updateObject() partly ->"
<< "\n orderConfirmation " << m_data.orderConfirmation << " new: " << data.confirmation.underlying()
<< "\n answerText " << m_data.answerText << " new: " << data.answerText;
@@ -140,7 +139,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
if (!m_mainHandler->db()->update(m_data))
{
ERROR_LOG(m_logger) << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
ERROR_LOG() << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
return false;
}
@@ -152,7 +151,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
//=============================================================================
bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
{
DEBUG_LOG(m_logger) << "updateObject(db) complete ->"
DEBUG_LOG() << "updateObject(db) complete ->"
<< "\n id " << m_data.id << " new: " << data.id
<< "\n centerPosition x " << m_data.centerPosition.x() << " new: " << data.centerPosition.x()
<< "\n centerPosition y " << m_data.centerPosition.y() << " new: " << data.centerPosition.y()
@@ -177,7 +176,7 @@ bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
if (!m_mainHandler->db()->update(m_data))
{
ERROR_LOG(m_logger) << "Failed effect Show updated Id: " << m_data.id;
ERROR_LOG() << "Failed effect Show updated Id: " << m_data.id;
return false;
}
@@ -195,7 +194,7 @@ bool ObjectEffectShow::resetOrderConfirmation()
if (!m_mainHandler->db()->update(m_data))
{
ERROR_LOG(m_logger) << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
ERROR_LOG() << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
return false;
}
@@ -221,7 +220,7 @@ ConvertToTab::EffectShowOrder_t ObjectEffectShow::getEffectShowOrder() const
order.typeOfAmmunition = m_data.typeOfAmmunition;
order.name = m_data.nameAreaEfffectSimulation;
DEBUG_LOG(m_logger) << "getEffectShowOrder():"
DEBUG_LOG() << "getEffectShowOrder():"
<< "\n idEffectShow " << order.idEffectShow
<< "\n areaDepth " << order.areaDepth
<< "\n areaWidth " << order.areaWidth
@@ -243,7 +242,7 @@ ConvertToTab::RetractOrder_t ObjectEffectShow::getRetractOrder() const
order.id = m_data.id;
order.orderType = 1;
DEBUG_LOG(m_logger) << "getRetractOrder():"
DEBUG_LOG() << "getRetractOrder():"
<< "\n id " << order.id
<< "\n orderType " << (int)order.orderType;
return order;
@@ -255,7 +254,7 @@ ConvertToTab::EffectShowContinue_t ObjectEffectShow::getContinueOrder() const
order.idEffectShow = m_data.id;
order.executionTime = m_data.startTime / 1000; // [ms] -> [s]
DEBUG_LOG(m_logger) << "getContinueOrder():"
DEBUG_LOG() << "getContinueOrder():"
<< "\n id " << order.idEffectShow
<< "\n orderType " << order.executionTime;
@@ -289,10 +288,10 @@ void ObjectEffectShow::onPublishData()
INFO_LOG(m_logger) << "Publish EsmEffectShow-data to dds (" << m_data.id << ") ...";
INFO_LOG() << "Publish EsmEffectShow-data to dds (" << m_data.id << ") ...";
if (!m_mainHandler->dds()->dts()->publish(ddsData))
ERROR_LOG(m_logger) << "Error publishing EsmEffectShow-data to dds";
ERROR_LOG() << "Error publishing EsmEffectShow-data to dds";
} // end of onPublishData()
//-----------------------------------------------------------------------------
} // Namespace EffectShowManagement