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/main_handler.cpp
+23 -23
View File
@@ -23,7 +23,7 @@ MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_logger(CentralEffectSimulation::getLogger("MainHandler"))
{
INFO_LOG(m_logger) << "MainHandler::MainHandler";
INFO_LOG() << "MainHandler::MainHandler";
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -34,47 +34,47 @@ MainHandler::~MainHandler()
m_handlerParticipant.reset();
m_handlerBuildingData.reset();
INFO_LOG(m_logger) << "MainHandler::~MainHandler";
INFO_LOG() << "MainHandler::~MainHandler";
} // end of dtor()
//-----------------------------------------------------------------------------
bool MainHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi)
{
DEBUG_LOG(m_logger) << "Trying to load ces plugin '" << pi.fullFileName << "'...";
DEBUG_LOG() << "Trying to load ces plugin '" << pi.fullFileName << "'...";
Plugin::Plugin *cesPlugin = qobject_cast<Plugin::Plugin *>(pi.plugin);
if (!cesPlugin)
{
WARNING_LOG(m_logger) << "failed loading a ces plugin - not a CentralEffectSimulation object!";
WARNING_LOG() << "failed loading a ces plugin - not a CentralEffectSimulation object!";
return false;
}
DEBUG_LOG(m_logger) << "... success";
DEBUG_LOG() << "... success";
std::shared_ptr<Plugin::Interface> ifc = cesPlugin->createInterface(this,
// m_ddsHandler->dds(),
nullptr,
Settings::settings(),
this);
DEBUG_LOG(m_logger) << "Vorher: m_interfaces.size=" << m_interfaces.size();
DEBUG_LOG() << "Vorher: m_interfaces.size=" << m_interfaces.size();
if (!ifc || !ifc->init(m_domainId, m_exerciseId))
{
WARNING_LOG(m_logger) << "Could not initialize CentralEffectSimulation plugin";
WARNING_LOG() << "Could not initialize CentralEffectSimulation plugin";
return false;
}
static int counter = 0;
INFO_LOG(m_logger) << "Loading and init of ces_plugin successfull: "
INFO_LOG() << "Loading and init of ces_plugin successfull: "
<< ++counter
<< " pluginName = '" << pi.pluginName << "'"
<< ", filename '" << pi.fullFileName << "'";
m_interfaces.push_back(ifc);
DEBUG_LOG(m_logger) << "Nachher: m_interfaces.size=" << m_interfaces.size();
DEBUG_LOG() << "Nachher: m_interfaces.size=" << m_interfaces.size();
DEBUG_LOG(m_logger) << "ECHO!" << ifc->echo(QStringLiteral("TEST"));
DEBUG_LOG() << "ECHO!" << ifc->echo(QStringLiteral("TEST"));
return true;
}
@@ -88,7 +88,7 @@ bool MainHandler::init(int domainId, int exerciseId)
{
m_domainId = domainId;
m_exerciseId = exerciseId;
INFO_LOG(m_logger) << "Start MessageDataManagement MainHandler. domainId =" << domainId
INFO_LOG() << "Start MessageDataManagement MainHandler. domainId =" << domainId
<< " exerciseId=" << exerciseId;
// initialize database
@@ -96,25 +96,25 @@ bool MainHandler::init(int domainId, int exerciseId)
if (!m_dbHandler->init(exerciseId, Settings::settings()))
{
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
ERROR_LOG() << "Initialisation DbHandler failed.";
return false;
}
m_db = m_dbHandler->db();
INFO_LOG(m_logger) << "MainHandler::init DbHandler initialized. ";
INFO_LOG() << "MainHandler::init DbHandler initialized. ";
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
if (!m_ddsHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
ERROR_LOG() << "Initialisation DdsHandler failed.";
if (m_ddsHandler->pacemaker())
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
NOTICE_LOG(m_logger) << LOGFUNCTION << " LtsElevationManager... ";
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " LtsElevationManager... ";
LtsElevation::LTS_ELEVATION_MANAGER_TYPE ltsElevationManager = LtsElevation::LtsElevationManager::createInstance(exerciseId,
dds()->exmDtc(),
@@ -126,7 +126,7 @@ bool MainHandler::init(int domainId, int exerciseId)
// So the logMsg 'Finished reading elevation map of file' will be shown with a delay.
// This is no error.
ltsElevationManager->waitForInitialization();
DEBUG_LOG(m_logger) << LOGFUNCTION << " LtsElevationManager... waitForInitialization DONE";
DEBUG_LOG() << Q_FUNC_INFO << " LtsElevationManager... waitForInitialization DONE";
// using elevationCbFunc = std::function<double(double, double, double, bool*)>;
using namespace std::placeholders;
@@ -134,11 +134,11 @@ bool MainHandler::init(int domainId, int exerciseId)
ltsElevationManager.data(), _1, _2, _3, _4);
LtsCoordTrans::LtsCoordinate::setElevationCallback(elevationCB);
NOTICE_LOG(m_logger) << LOGFUNCTION << " LtsElevationManager... LtsCoordinate::setElevationCallback DONE";
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " LtsElevationManager... LtsCoordinate::setElevationCallback DONE";
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " LtsElevationManager... DONE ";
DEBUG_LOG() << Q_FUNC_INFO << " LtsElevationManager... DONE ";
@@ -147,7 +147,7 @@ bool MainHandler::init(int domainId, int exerciseId)
if (!m_handlerBuildingData->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerBuildingData failed.";
ERROR_LOG() << "Initialisation HandlerBuildingData failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -168,7 +168,7 @@ bool MainHandler::init(int domainId, int exerciseId)
if (!m_handlerParticipant->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerParticipant failed.";
ERROR_LOG() << "Initialisation HandlerParticipant failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -194,13 +194,13 @@ bool MainHandler::init(int domainId, int exerciseId)
if (m_interfaces.empty())
{
WARNING_LOG(m_logger) << "Could not load any Central Effect Simulation plugin";
WARNING_LOG() << "Could not load any Central Effect Simulation plugin";
return false;
}
INFO_LOG(m_logger) << "m_interfaces size=" << m_interfaces.size();
INFO_LOG() << "m_interfaces size=" << m_interfaces.size();
// for (/*std::shared_ptr<*/Plugin::EchoInterface/*> &*/ *ifc : m_interfaces)
// INFO_LOG(m_logger) << "ECHO! " << ifc->echo(QStringLiteral("TEST"));
// INFO_LOG() << "ECHO! " << ifc->echo(QStringLiteral("TEST"));
//m_txHandler->addTxHandler(ifc->sendToTab());
///////////////////
/// End Plugins ///