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/MarkerManagement/object_marker.cpp
+7 -8
View File
@@ -16,7 +16,6 @@ namespace MarkerManagement
ObjectMarker::ObjectMarker(const std::shared_ptr<DdsHandler> &ddsHandler, const std::shared_ptr<DatabaseInterface> &db)
: m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("ObjectMarker"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -40,9 +39,9 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
// Neue DB Id in lokale Struktur uebernehmen
m_dataMarkerObject.id(dbDataMarker.id);
DEBUG_LOG(m_logger) << "New MarkerId: " << dbDataMarker.id;
DEBUG_LOG() << "New MarkerId: " << dbDataMarker.id;
DEBUG_LOG(m_logger) << "Handle MarkerDescription for markerId:" << dbDataMarker.id << " number of depending descriptions: " << data.descriptions().size();
DEBUG_LOG() << "Handle MarkerDescription for markerId:" << dbDataMarker.id << " number of depending descriptions: " << data.descriptions().size();
// Behandlung von MarkerDescription
for (size_t i = 0; i < data.descriptions().size(); ++i)
@@ -82,10 +81,10 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
if (!m_db->update(dbDataMarker))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating MrkMarker-data into database"));
DEBUG_LOG(m_logger) << "Data changed for markerId: " << m_dataMarkerObject.id();
DEBUG_LOG() << "Data changed for markerId: " << m_dataMarkerObject.id();
INFO_LOG(m_logger) << "Handle MarkerDescriptions for markerId:" << data.id()
INFO_LOG() << "Handle MarkerDescriptions for markerId:" << data.id()
<< ". Number of pending descriptions (new/previous):"
<< data.descriptions().size() << "/" << m_dataMarkerObject.descriptions().size();
@@ -123,7 +122,7 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
}
if (!bFound)
{
DEBUG_LOG(m_logger) << "Description with id " << oldDesc.id() << " was removed - removing from db";
DEBUG_LOG() << "Description with id " << oldDesc.id() << " was removed - removing from db";
if (!m_db->removeMrkMarkerDescription(oldDesc.id()))
return Core::FunctionReplyObject(data.id(),
tr_lts("dds", "MarkerDescription with id %1 can not be removed"))
@@ -185,10 +184,10 @@ bool ObjectMarker::isUsed() const
void ObjectMarker::onPublishData()
{
INFO_LOG(m_logger) << "Publish MrkMarker-data to dds markerId:" << m_dataMarkerObject.id() ;
INFO_LOG() << "Publish MrkMarker-data to dds markerId:" << m_dataMarkerObject.id() ;
if (!m_ddsHandler->dts()->publish(m_dataMarkerObject))
WARNING_LOG(m_logger) << "Error publishing MrkMarker-data to dds";
WARNING_LOG() << "Error publishing MrkMarker-data to dds";
} // end of onPublishData()
//-----------------------------------------------------------------------------