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/VideoOverlayManagement/main_handler.cpp
+17 -18
View File
@@ -27,7 +27,6 @@ MainHandler::MainHandler(QObject *parent)
, m_checkConnectTimer(new QTimer(this))
, m_keepAliveTriggerTimer(new QTimer(this))
, m_bAvsSocketWarnedOnce(false)
, m_logger(getLogger("MainHandler"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -40,14 +39,14 @@ MainHandler::~MainHandler()
bool MainHandler::init(int domainId, int exerciseId)
{
INFO_LOG(m_logger) << "Start VideoOverlayManagement MainHandler.";
INFO_LOG() << "Start VideoOverlayManagement MainHandler.";
m_exerciseId = exerciseId;
// init AVS-Interface
QString hostName = Settings::getAvsHostname();
quint16 port = Settings::getAvsAvaPort();
INFO_LOG(m_logger) << "Init AVS-Interface Hostname/Ip:" << hostName
INFO_LOG() << "Init AVS-Interface Hostname/Ip:" << hostName
<< " Port: " << port;
m_avsIf->start(hostName, port);
@@ -69,7 +68,7 @@ bool MainHandler::init(int domainId, int exerciseId)
m_ddsHandler.reset(new 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;
@@ -80,7 +79,7 @@ bool MainHandler::init(int domainId, int exerciseId)
if (!m_handlerParticipantData->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerPlayerData failed.";
ERROR_LOG() << "Initialisation HandlerPlayerData failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -90,7 +89,7 @@ bool MainHandler::init(int domainId, int exerciseId)
if (!m_handlerInfrastructureData->init(m_exerciseId))
{
ERROR_LOG(m_logger) << "Initialisation HandlerInfrastructreData failed.";
ERROR_LOG() << "Initialisation HandlerInfrastructreData failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
@@ -100,7 +99,7 @@ bool MainHandler::init(int domainId, int exerciseId)
this, &MainHandler::onTryToInitOverlayHandler);
m_checkConnectTimer->start(1000);
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS may be still pending) ";
INFO_LOG() << "VOM Handler initialized. (Connection to AVS may be still pending) ";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
return true;
@@ -115,7 +114,7 @@ bool MainHandler::onTryToInitOverlayHandler()
if (!m_bAvsSocketWarnedOnce)
{
m_bAvsSocketWarnedOnce = true;
WARNING_LOG(m_logger) << "MainHandler::onTryToInitOverlayHandler()"
WARNING_LOG() << "MainHandler::onTryToInitOverlayHandler()"
<< " Wait for AvsIfConnectionState::Connected... ";
}
return false;
@@ -129,12 +128,12 @@ bool MainHandler::onTryToInitOverlayHandler()
if (!m_handlerOverlays->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerOverlays failed.";
ERROR_LOG() << "Initialisation HandlerOverlays failed.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
return false;
}
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS established) ";
INFO_LOG() << "VOM Handler initialized. (Connection to AVS established) ";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
return true;
@@ -146,7 +145,7 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
switch (state)
{
case AvsIfConnectionState::Connected:
INFO_LOG(m_logger) << "AvsIfConnectionState::Connected ... start keepAliveTriggerTimer";
INFO_LOG() << "AvsIfConnectionState::Connected ... start keepAliveTriggerTimer";
m_keepAliveTriggerTimer->start(Settings::getAvsKeepAliveTriggerRequestTime());
break;
case AvsIfConnectionState::Disconnected:
@@ -156,13 +155,13 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
m_keepAliveTriggerTimer->stop();
break;
case AvsIfConnectionState::ConnectionError:
ERROR_LOG(m_logger) << "AvsIfConnectionState::ConnectionError !";
ERROR_LOG() << "AvsIfConnectionState::ConnectionError !";
m_keepAliveTriggerTimer->stop();
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
break;
case AvsIfConnectionState::Undefined:
default:
WARNING_LOG(m_logger) << "Undefined AvsIfConnectionState !";
WARNING_LOG() << "Undefined AvsIfConnectionState !";
break;
}
} // end of onAvsIfConnectionState()
@@ -174,17 +173,17 @@ void MainHandler::onAvsCmdState(AvsCmdState state)
switch (state)
{
case AvsCmdState::Ok:
INFO_LOG(m_logger) << "AvsCmdState::Ok";
INFO_LOG() << "AvsCmdState::Ok";
bOk = true;
break;
case AvsCmdState::BadArguments:
WARNING_LOG(m_logger) << "AvsCmdState::BadArguments";
WARNING_LOG() << "AvsCmdState::BadArguments";
break;
case AvsCmdState::CommandNotStateValid:
WARNING_LOG(m_logger) << "AvsCmdState::CommandNotStateValid";
WARNING_LOG() << "AvsCmdState::CommandNotStateValid";
break;
case AvsCmdState::KeepAlive:
DEBUG_LOG(m_logger) << "AvsCmdState::KeepAlive";
DEBUG_LOG() << "AvsCmdState::KeepAlive";
break;
default:
break;
@@ -200,7 +199,7 @@ void MainHandler::onAvsCmdState(AvsCmdState state)
void MainHandler::onAvsKeepAliveTimeout()
{
// ToDo: Fehlermeldung an ServiceManagement senden
WARNING_LOG(m_logger) << "AVS KeepAlive timeout !";
WARNING_LOG() << "AVS KeepAlive timeout !";
} // end of onAvsKeepAliveTimeout()
//-----------------------------------------------------------------------------