Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- 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:
2785 files changed
+18754
-18316
No files matched your search
+12
-13
@@ -17,7 +17,6 @@ HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHa
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_exerciseId(0)
|
||||
, m_logger(getLogger("HandlerInfrastructureData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -34,7 +33,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
if (m_dtc == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not create DTC InfrastructureManagement";
|
||||
ERROR_LOG() << "Could not create DTC InfrastructureManagement";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -45,7 +44,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
!m_dtc->waitForHistoricalDataMountingPointAsset() ||
|
||||
!m_dtc->waitForHistoricalDataInstrumentationAsset())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "init() DTC InfrastructureManagement failed";
|
||||
ERROR_LOG() << "init() DTC InfrastructureManagement failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,7 +58,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
};
|
||||
if (!m_dtc->getAllAssetsPerRoom(predicate, assetsMap))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
|
||||
WARNING_LOG() << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
|
||||
<< " assetsMap.size(): " << assetsMap.size();
|
||||
}
|
||||
|
||||
@@ -72,7 +71,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
asset.availableInExercise().end(), m_exerciseId);
|
||||
if (it == asset.availableInExercise().end())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Asset " << asset.id()
|
||||
DEBUG_LOG() << "Asset " << asset.id()
|
||||
<< " is not available in current exercise - skipping";
|
||||
continue;
|
||||
}
|
||||
@@ -80,16 +79,16 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
m_roomId2CameraNameMap.insert(roomId, QString::fromStdString(asset.name()));
|
||||
// und fuer subscribe in m_assetId2RoomIdMap eintragen
|
||||
m_assetId2RoomIdMap.insert(asset.id(), roomId);
|
||||
DEBUG_LOG(m_logger) << " assetId: " << asset.id()
|
||||
DEBUG_LOG() << " assetId: " << asset.id()
|
||||
<< " mountingPointTypeId: " << asset.mountingPointTypeId()
|
||||
<< " name: " << asset.name();
|
||||
}
|
||||
} // for(auto i = assetMap...
|
||||
|
||||
INFO_LOG(m_logger) << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
|
||||
INFO_LOG() << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
|
||||
for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
|
||||
{
|
||||
INFO_LOG(m_logger) << "roomId: " << i.key()
|
||||
INFO_LOG() << "roomId: " << i.key()
|
||||
<< " cameraName: " << i.value();
|
||||
}
|
||||
|
||||
@@ -101,7 +100,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
|
||||
m_dtc->enableMainStructureElement(false);
|
||||
m_dtc->enableMountingPointAsset(false);
|
||||
|
||||
INFO_LOG(m_logger) << "HandlerInfrastructureData::init() finished. "
|
||||
INFO_LOG() << "HandlerInfrastructureData::init() finished. "
|
||||
<< " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -117,7 +116,7 @@ QString HandlerInfrastructureData::getStreamNameFromRoomId(int roomId) const
|
||||
{
|
||||
auto it = m_roomId2CameraNameMap.find(roomId);
|
||||
const QString qs(it == m_roomId2CameraNameMap.end() ? QString() : it.value());
|
||||
DEBUG_LOG(m_logger) << "streamName for roomId: " << roomId << " '" << qs << "' ";
|
||||
DEBUG_LOG() << "streamName for roomId: " << roomId << " '" << qs << "' ";
|
||||
|
||||
return qs;
|
||||
} // end of getStreamNameFromRoomId()
|
||||
@@ -129,7 +128,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
|
||||
if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "onAssetChanged()"
|
||||
INFO_LOG() << "onAssetChanged()"
|
||||
<< " assetId: " << data.id()
|
||||
<< " name: " << data.name();
|
||||
|
||||
@@ -137,7 +136,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
|
||||
data.availableInExercise().end(), m_exerciseId);
|
||||
if (it == data.availableInExercise().end())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Asset " << data.id()
|
||||
DEBUG_LOG() << "Asset " << data.id()
|
||||
<< " is not available in current exercise - skipping";
|
||||
return;
|
||||
}
|
||||
@@ -147,7 +146,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
|
||||
|
||||
for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "m_roomId2CameraNameMap changed... "
|
||||
DEBUG_LOG() << "m_roomId2CameraNameMap changed... "
|
||||
<< " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size()
|
||||
<< " roomId: " << i.key()
|
||||
<< " cameraName: " << *i;
|
||||
|
||||
Reference in new issue
Block a user