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/CentralEffectSimulation/handler_building_data.cpp
+25 -25
View File
@@ -24,7 +24,7 @@ HandlerBuildingData::HandlerBuildingData(const std::shared_ptr<CentralEffectSimu
, m_ddsHandler(ddsHandler)
, m_logger(CentralEffectSimulation::getLogger("HandlerBuildingData"))
{
INFO_LOG(m_logger) << "HandlerBuildingData::HandlerBuildingData()";
INFO_LOG() << "HandlerBuildingData::HandlerBuildingData()";
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -34,7 +34,7 @@ HandlerBuildingData::~HandlerBuildingData()
//-----------------------------------------------------------------------------
bool HandlerBuildingData::init()
{
INFO_LOG(m_logger) << "HandlerBuildingData::init()";
INFO_LOG() << "HandlerBuildingData::init()";
auto dtcIsm = m_ddsHandler->dtcIsm();
dtcIsm->waitForHistoricalDataMainStructureElement(1000);
@@ -67,18 +67,18 @@ bool HandlerBuildingData::init()
// ///////////////////////////////////
void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
{
INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id();
INFO_LOG() << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id();
if (modType == DataModification::eRemoved
|| !m_ddsHandler->dtcIsm()->isElementAssignedToExercise(data, m_ddsHandler->getExerciseId()))
{
INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove";
INFO_LOG() << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove";
m_mainStructureElements.remove(data.id());
m_footprints.remove(data.id());
return;
}
m_mainStructureElements.insert(data.id(), data);
DEBUG_LOG(m_logger) << "Got MainStructureElement: " << data;
DEBUG_LOG() << "Got MainStructureElement: " << data;
for (const InfrastructureManagement::StructureElement &ele : std::as_const(data.elements()))
{
if (ele.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room)
@@ -89,7 +89,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana
const int structureElementId = path.at(0);
const int floorId = path.at(1);
const int roomId = path.at(2);
DEBUG_LOG(m_logger) << "ele.id=" << ele.id() << " name =" << ele.name()
DEBUG_LOG() << "ele.id=" << ele.id() << " name =" << ele.name()
<< " ele.StructureElementType=" << ele.structureElementTypeId()
<< " buildingId = " << structureElementId
<< " floorId =" << floorId
@@ -102,7 +102,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana
{
if (ele.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
{
DEBUG_LOG(m_logger) << "EGCU id=" << ele.id()
DEBUG_LOG() << "EGCU id=" << ele.id()
<< " displayName=" << ele.displayName()
<< " name=" << ele.name()
<< " type=" << ele.mountingPointTypeId();
@@ -121,7 +121,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana
//QString hostname = QString::fromStdString(ele.hostname());
//assetPosition.hostname = hostname;
m_assetPositions.insert(assetPosition.structureElementId, assetPosition);
DEBUG_LOG(m_logger) << "assetPosition.insert StructureElementId= " << assetPosition.structureElementId
DEBUG_LOG() << "assetPosition.insert StructureElementId= " << assetPosition.structureElementId
<< " geoPosition=" << assetPosition.geoPosition
<< " relPosition=" << assetPosition.relPosition
<< " hostname=" << assetPosition.hostname
@@ -141,7 +141,7 @@ void HandlerBuildingData::onMountingPointAssetChanged(const InfrastructureManage
if (modType == DataModification::eRemoved)
return;
DEBUG_LOG(m_logger) << "onMountingPointAssetChanged id=" << data.id()
DEBUG_LOG() << "onMountingPointAssetChanged id=" << data.id()
<< " assetId=" << data.assetId()
<< " structureElementId=" << data.structureElementId();
m_mountingPointAsset.insert(data.structureElementId(), m_assetMountingPoint.value(data.assetId()));
@@ -155,7 +155,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
{
DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id=" << data.id()
DEBUG_LOG() << "onInstrumentationAssetChanged id=" << data.id()
<< " hostname=" << data.hostname();
QString hostname = QString::fromStdString(data.hostname());
m_instrumentationAssets.insert(data.id(), hostname);
@@ -163,7 +163,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
{
int assetId = data.id();
int mountpointId = m_assetMountingPoint.value(assetId);
DEBUG_LOG(m_logger) << "m_instrumentationAsset.contains(" << assetId << ")"
DEBUG_LOG() << "m_instrumentationAsset.contains(" << assetId << ")"
<< " assetId=" << assetId
<< " mountpointId=" << mountpointId;
if (m_assetPositions.contains(mountpointId))
@@ -172,7 +172,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
assetPosition.hostname = hostname;
assetPosition.mountingPointType = data.mountingPointTypeId();
m_assetPositions.insert(assetPosition.structureElementId, assetPosition);
DEBUG_LOG(m_logger) << "m_assetPositions.insert assetPosition structureElementId= " << assetPosition.structureElementId
DEBUG_LOG() << "m_assetPositions.insert assetPosition structureElementId= " << assetPosition.structureElementId
<< " type=" << assetPosition.mountingPointType
<< " geoPosition=" << assetPosition.geoPosition
<< " relPosition=" << assetPosition.relPosition
@@ -186,7 +186,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
QVector<int> HandlerBuildingData::getFloorsFromStructureElementId(int structureElementId) const
{
DEBUG_LOG(m_logger) << "getFloorsFromStructureElementId structureElementId=" << structureElementId;
DEBUG_LOG() << "getFloorsFromStructureElementId structureElementId=" << structureElementId;
QVector<int> result;
result.reserve(m_structureElementToFloor.size());
for (auto i = m_structureElementToFloor.begin(); i != m_structureElementToFloor.end(); ++i)
@@ -194,13 +194,13 @@ QVector<int> HandlerBuildingData::getFloorsFromStructureElementId(int structureE
if (i.value() == structureElementId)
result.append(i.key());
}
DEBUG_LOG(m_logger) << "result.size()" << result.size();
DEBUG_LOG() << "result.size()" << result.size();
return result;
}
QVector<int> HandlerBuildingData::getFloorsFromBuilding(int buildingId) const
{
DEBUG_LOG(m_logger) << "getFloorsFromBuilding buildingId=" << buildingId;
DEBUG_LOG() << "getFloorsFromBuilding buildingId=" << buildingId;
QVector<int> result;
result.reserve(m_buildingFloor.size());
for (auto i = m_buildingFloor.begin(); i != m_buildingFloor.end(); ++i)
@@ -208,18 +208,18 @@ QVector<int> HandlerBuildingData::getFloorsFromBuilding(int buildingId) const
if (i.value() == buildingId)
result.append(i.key());
}
DEBUG_LOG(m_logger) << "result.size()" << result.size();
DEBUG_LOG() << "result.size()" << result.size();
return result;
}
void HandlerBuildingData::printAssetPositions()
{
DEBUG_LOG(m_logger) << "printAssetPositions: ";
DEBUG_LOG() << "printAssetPositions: ";
QHashIterator<int, AssetPosition> i(m_assetPositions);
while (i.hasNext())
{
i.next();
DEBUG_LOG(m_logger) << "printAssetPositions: "
DEBUG_LOG() << "printAssetPositions: "
<< i.key() << ": " << i.value().structureElementId
<< " type = " << i.value().mountingPointType
<< " hostname =" << i.value().hostname
@@ -237,24 +237,24 @@ int HandlerBuildingData::getBuildingIdFromRoomId(const int roomId)
buildingId = -1;
else
buildingId = getBuildingIdFromFloorId(floorId);
DEBUG_LOG(m_logger) << "getBuildingIdFromRoomId roomId=" << roomId
DEBUG_LOG() << "getBuildingIdFromRoomId roomId=" << roomId
<< " buildingId=" << buildingId;
return buildingId;
}
QVector<int> HandlerBuildingData::polygonEncloseBuildings(const QPolygonF &polygon)
{
DEBUG_LOG(m_logger) << "polygonEncloseBuildings";
DEBUG_LOG() << "polygonEncloseBuildings";
int exerciseId = m_ddsHandler->getExerciseId();
bool completeEnclosed = true;
DEBUG_LOG(m_logger) << "Vor getBuildingByPolygon";
DEBUG_LOG() << "Vor getBuildingByPolygon";
bool isGroundLevel = false;
QVector<int> buildingsInside = m_ddsHandler->dtcIsm()->getBuildingByPolygon(exerciseId, polygon, completeEnclosed, isGroundLevel);
DEBUG_LOG(m_logger) << "Nach getBuildingByPolygon";
DEBUG_LOG() << "Nach getBuildingByPolygon";
//int buildingId = m_ddsHandler->dtcIsm()->getSurroundingBuildingByPolygon(exerciseId, polygon);
//DEBUG_LOG(m_logger) << "getSurroundingBuildingByPolygon buildingId= " << buildingId;
//DEBUG_LOG() << "getSurroundingBuildingByPolygon buildingId= " << buildingId;
return buildingsInside;
}
@@ -269,7 +269,7 @@ void HandlerBuildingData::getFootprintsByExercise()
while (i.hasNext())
{
i.next();
DEBUG_LOG(m_logger) << "Key=" << i.key() << ": " << i.value().size();
DEBUG_LOG() << "Key=" << i.key() << ": " << i.value().size();
Footprint footprint;
footprint.mseId = i.key();
footprint.polyUtm = i.value();
@@ -279,7 +279,7 @@ void HandlerBuildingData::getFootprintsByExercise()
// for concealment calculation (Verdeckung)
if (!footprint.boundingBoxPolyUtm.isValid())
{
WARNING_LOG(m_logger) << "mseId=" << footprint.mseId
WARNING_LOG() << "mseId=" << footprint.mseId
<< " boundingBoxPolyUtm not valid";
continue;
}