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/AssetManagement/handler_training_area.cpp
+22 -23
View File
@@ -23,7 +23,6 @@ HandlerTrainingArea::HandlerTrainingArea(MainHandler *mainHandler, QObject *pare
, Interface::Fts::MapDescriptionModifyRequestHandler(mainHandler->dds()->fts())
, Interface::Fts::MapDescriptionRemoveRequestHandler(mainHandler->dds()->fts())
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerTrainingArea"))
{
}
@@ -43,7 +42,7 @@ bool HandlerTrainingArea::init()
QVector<Database::AsmMapDescription> dataVecMD;
if (!m_mainHandler->db()->select(dataVecMD))
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return false;
}
@@ -59,38 +58,38 @@ bool HandlerTrainingArea::init()
{
case AssetManagement::MapDescriptionType_def::Map2D:
mapDescriptionSeq.map2D.insert(data.objOrder, data);
INFO_LOG(m_logger) << "map2D.insert order =" << data.objOrder;
INFO_LOG() << "map2D.insert order =" << data.objOrder;
break;
case AssetManagement::MapDescriptionType_def::Scene3D:
mapDescriptionSeq.scene3D.insert(data.objOrder, data);
INFO_LOG(m_logger) << "Scene3D.insert order =" << data.objOrder;
INFO_LOG() << "Scene3D.insert order =" << data.objOrder;
break;
case AssetManagement::MapDescriptionType_def::Elevation:
mapDescriptionSeq.elevation.insert(data.objOrder, data);
INFO_LOG(m_logger) << "Elevation.insert order =" << data.objOrder;
INFO_LOG() << "Elevation.insert order =" << data.objOrder;
break;
case AssetManagement::MapDescriptionType_def::SceneObj:
mapDescriptionSeq.sceneObj.insert(data.objOrder, data);
INFO_LOG(m_logger) << "sceneObj.insert order =" << data.objOrder;
INFO_LOG() << "sceneObj.insert order =" << data.objOrder;
break;
}
mapDescriptionSeqences.insert(data.trainingAreaId, mapDescriptionSeq);
if (ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
return false;
}
m_objectMapDescriptionMap.insert(ifs->getId(), ifs);
}
DEBUG_LOG(m_logger) << "m_objectMapDescriptionMap.size() = " << m_objectMapDescriptionMap.size();
DEBUG_LOG() << "m_objectMapDescriptionMap.size() = " << m_objectMapDescriptionMap.size();
QVector<Database::AsmTrainingArea> dataVec;
// read all training areas from database
if (!m_mainHandler->db()->select(dataVec))
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return false;
}
@@ -126,13 +125,13 @@ bool HandlerTrainingArea::init()
if (ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
return false;
}
m_objectTrainingAreaMap.insert(ifs->getId(), ifs);
}
DEBUG_LOG(m_logger) << "m_objectTrainingAreaMap.size() = " << m_objectTrainingAreaMap.size();
DEBUG_LOG() << "m_objectTrainingAreaMap.size() = " << m_objectTrainingAreaMap.size();
return true;
}
@@ -140,16 +139,16 @@ bool HandlerTrainingArea::init()
//----------------------------------------------------------------------------------------------
void HandlerTrainingArea::removeMapDescriptions(int trainingAreaId)
{
INFO_LOG(m_logger) << "removeMapDescriptions trainingAreaId = " << trainingAreaId
INFO_LOG() << "removeMapDescriptions trainingAreaId = " << trainingAreaId
<< " m_objectMapDescriptionMap.size = " << m_objectMapDescriptionMap.size();
QMapIterator< int, ObjectMapDescription *> it(m_objectMapDescriptionMap);
while ( it.hasNext())
{
it.next();
INFO_LOG(m_logger) << "remove map description key = " << it.key();
INFO_LOG() << "remove map description key = " << it.key();
if ( it.value()->getData().trainingAreaId() == trainingAreaId)
{
DEBUG_LOG(m_logger) << "remove id= " << it.key();
DEBUG_LOG() << "remove id= " << it.key();
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(it.key());
@@ -166,7 +165,7 @@ void HandlerTrainingArea::onTrainingAreaModifyRequest(const rti::core::SampleIde
{
const auto ret = trainingAreaModifyRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_mainHandler->dds()->fts()->trainingAreaModifyReply(cookie, ret);
}
@@ -201,7 +200,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
}
if (request.id() > 0) // Modify
{
DEBUG_LOG(m_logger) << "modify: delete old entries in map_description";
DEBUG_LOG() << "modify: delete old entries in map_description";
removeMapDescriptions(ifs->getId());
}
@@ -216,7 +215,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert topographic entries in map_description"
DEBUG_LOG() << "insert topographic entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -241,7 +240,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert elevation entries in map_description"
DEBUG_LOG() << "insert elevation entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -266,7 +265,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert scene3D entries in map_description"
DEBUG_LOG() << "insert scene3D entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -291,7 +290,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert sceneObjects entries in map_description"
DEBUG_LOG() << "insert sceneObjects entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -336,7 +335,7 @@ void HandlerTrainingArea::onTrainingAreaRemoveRequest(const rti::core::SampleIde
ret = ifs->removeObject();
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
else
{
// delete ObjectTrainingArea
@@ -357,7 +356,7 @@ void HandlerTrainingArea::onMapDescriptionModifyRequest(const rti::core::SampleI
{
const auto ret = mapDescriptionModifyRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_mainHandler->dds()->fts()->mapDescriptionModifyReply(cookie, ret);
}
@@ -394,7 +393,7 @@ void HandlerTrainingArea::onMapDescriptionRemoveRequest(const rti::core::SampleI
ret = ifs->removeObject();
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
else
{
// delete ObjectMapDescription