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
+9
-10
@@ -29,7 +29,6 @@ BgViewerController::BgViewerController(QObject *parent)
|
||||
, m_pBgViewerDDSController(nullptr)
|
||||
, m_bgvApp(nullptr)
|
||||
, m_tickTimer(new QTimer(this))
|
||||
, m_logger(getLogger("BgViewerControllerSingleton"))
|
||||
{
|
||||
m_tickTimer->setInterval(1000 / 25);
|
||||
connect(m_tickTimer, &QTimer::timeout, this, [this]() { m_mainloop.tick(); });
|
||||
@@ -183,7 +182,7 @@ QString BgViewerController::buildingModelPath()
|
||||
|
||||
void BgViewerController::clearInterfaces(const LtsSession::DdsConnectionParams &conParams)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "BgViewerControllerSingleton::clearInterfaces()";
|
||||
DEBUG_LOG() << "BgViewerControllerSingleton::clearInterfaces()";
|
||||
if (m_pBgViewerDDSController && m_currentDdsConnParams == conParams)
|
||||
{
|
||||
m_pBgViewerDDSController->uninitialize();
|
||||
@@ -220,13 +219,13 @@ PluginProvider *BgViewerController::activeSession() const
|
||||
|
||||
bool BgViewerController::init(PluginProvider *pSession, bool bStartRendering, const QString &modelPath)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "getDdsController init: " << pSession->toString();
|
||||
DEBUG_LOG() << "getDdsController init: " << pSession->toString();
|
||||
|
||||
if (m_currentDdsConnParams == pSession->connParams())
|
||||
{
|
||||
if (m_initExerciseWasSuccessful)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "BgViewerControllerSingleton::init Already initialized";
|
||||
DEBUG_LOG() << "BgViewerControllerSingleton::init Already initialized";
|
||||
slotLoadBuilding();
|
||||
|
||||
|
||||
@@ -252,7 +251,7 @@ bool BgViewerController::forceInit(PluginProvider *pSession)
|
||||
delete m_pBgViewerDDSController;
|
||||
m_pBgViewerDDSController = new BuildingViewerDdsController(m_comIfc, m_viewerInterface);
|
||||
|
||||
DEBUG_LOG(m_logger) << "FORCE INIT! with " << pSession;
|
||||
DEBUG_LOG() << "FORCE INIT! with " << pSession;
|
||||
return (m_pBgViewerDDSController->init(m_bgViewerBaseLayoutWidget, buildingModelPath(), pSession));
|
||||
|
||||
}
|
||||
@@ -282,11 +281,11 @@ void BgViewerController::showBgViewerInfoMessageBox()
|
||||
|
||||
bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSession)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << std::hex << this << " startBgViewerAppInSession " << (m_currentDdsConnParams == pStartingSession->connParams());
|
||||
DEBUG_LOG() << std::hex << this << " startBgViewerAppInSession " << (m_currentDdsConnParams == pStartingSession->connParams());
|
||||
|
||||
if (m_bgvApp && (m_currentDdsConnParams == pStartingSession->connParams()))
|
||||
{
|
||||
INFO_LOG(m_logger) << std::hex << this << " BuildingViewer already opened. Doing nothing...";
|
||||
INFO_LOG() << std::hex << this << " BuildingViewer already opened. Doing nothing...";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -299,7 +298,7 @@ bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSess
|
||||
|
||||
if (m_bgvApp)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << std::hex << this << " Releasing m_bgvApp";
|
||||
DEBUG_LOG() << std::hex << this << " Releasing m_bgvApp";
|
||||
delete m_bgvApp;
|
||||
m_bgvApp = nullptr;
|
||||
|
||||
@@ -311,7 +310,7 @@ bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSess
|
||||
m_bgvApp = LtsAppManager::LtsAppManager::getInstance()->createApp(LtsAppDescriptor::App::BuildingViewer, pStartingSession->connParams());
|
||||
if (!m_bgvApp || !m_bgvApp->sessions().size())
|
||||
{
|
||||
ERROR_LOG(m_logger) << std::hex << this << " m_bgvApp is nullptr or has no associated session!";
|
||||
ERROR_LOG() << std::hex << this << " m_bgvApp is nullptr or has no associated session!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -336,7 +335,7 @@ bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSess
|
||||
connect(m_bgvApp, &LtsPluginManager::LtsPluginManager::destroyed,
|
||||
this, [this]()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << std::hex << this << " LtsPluginManager destroyed m_bgvApp";
|
||||
DEBUG_LOG() << std::hex << this << " LtsPluginManager destroyed m_bgvApp";
|
||||
m_tickTimer->stop();
|
||||
clearInterfaces(m_currentDdsConnParams);
|
||||
m_comIfc->excCloseAllViews();
|
||||
|
||||
Reference in new issue
Block a user