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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -14,7 +14,6 @@ namespace ApHlaJson
AesHandler::AesHandler(QObject *parent)
: QObject(parent)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("AesHandler"))
{}
bool AesHandler::init(MainDispatcher* mainDispatcher)
@@ -26,7 +25,7 @@ bool AesHandler::init(MainDispatcher* mainDispatcher)
if (!m_ftcAes->enableAirSupportImpactModify())
{
ERROR_LOG(m_logger) << "Can not enableAirSupportImpactModify ";
ERROR_LOG() << "Can not enableAirSupportImpactModify ";
return false;
}
@@ -36,9 +36,6 @@ private:
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_ftcAes;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
LtsUtils::RequestHelper *m_requestHelper;
LOGGER_T m_logger;
};
}
@@ -10,16 +10,15 @@ namespace ApHlaJson
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
ERROR_LOG() << "Error initializing dds connections - aborting";
return false;
}
@@ -33,7 +33,6 @@ public:
private:
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
NGL::INGLLogger &m_logger;
};
}
@@ -26,7 +26,6 @@ HlaDispatcher::HlaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_webSocket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
, m_webSocketReconnectTimer(new QTimer(this))
, m_bWarnedOnce(false)
, m_logger(getLogger("HlaDispatcher"))
{
connect(m_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
this, &HlaDispatcher::onWebSocketError);
@@ -68,7 +67,7 @@ bool HlaDispatcher::canSendData() const
void HlaDispatcher::onWebSocketConnected()
{
INFO_LOG(m_logger) << "WebSocket connected";
INFO_LOG() << "WebSocket connected";
QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
m_sendToHla->onWebSocketConnected(ws);
m_webSocketReconnectTimer->stop();
@@ -77,7 +76,7 @@ void HlaDispatcher::onWebSocketConnected()
void HlaDispatcher::onWebsocketDisconnected()
{
INFO_LOG(m_logger) << "Hla socket disconnected";
INFO_LOG() << "Hla socket disconnected";
m_sendToHla->onWebSocketDisconnected();
emit connectionState(QString::fromUtf8(name()), false);
@@ -96,7 +95,7 @@ void HlaDispatcher::onWebSocketError()
if (!m_webSocket)
return;
if (!m_bWarnedOnce)
WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
m_webSocket->close();
m_webSocketReconnectTimer->start(5000);
m_bWarnedOnce = true;
@@ -107,7 +106,7 @@ void HlaDispatcher::onWebSocketError()
void HlaDispatcher::onTextMessageReceived(const QByteArray &message)
{
INFO_LOG(m_logger) << "Text Message received: " << message;
INFO_LOG() << "Text Message received: " << message;
m_recvFromHla->handleTelegram(message);
}
@@ -6,7 +6,7 @@
#include <QObject>
#include <QWebSocket>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <DDS/Core/function_reply_object.h>
#include <DDS/Core/core_types.h>
#include "logger.h"
#include "ppm_handler.h"
#include "aes_handler.h"
@@ -59,8 +59,6 @@ private:
QWebSocket *m_webSocket;
QTimer *m_webSocketReconnectTimer;
bool m_bWarnedOnce;
NGL::INGLLogger &m_logger;
};
}
@@ -24,7 +24,6 @@ HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
, m_bWarnedOnceTx(false)
, m_aesHandler(aesHandler)
, m_ppmHandler(ppmHandler)
, m_logger(getLogger("HlaHandlerRx"))
{}
bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
@@ -39,12 +38,12 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
if (!typeId.isDouble())
{
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
ERROR_LOG() << "Can not read type id: " << baJson;
return false;
}
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
if(typeId.toInt() != 21)
ERROR_LOG(m_logger) << "Telegram before filter: " << baJson;
ERROR_LOG() << "Telegram before filter: " << baJson;
try
{
QJsonValue header = data[QStringLiteral("header")];
@@ -58,7 +57,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
return false;
}
if(typeId.toInt() != 21)
ERROR_LOG(m_logger) << "Telegram after filter: " << baJson;
ERROR_LOG() << "Telegram after filter: " << baJson;
switch (typeId.toInt())
{
case Constraints<ProxyConnectionState>::id():
@@ -111,7 +110,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
}
catch (const std::exception &e)
{
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
return false;
}
return true;
@@ -131,7 +130,7 @@ void HlaHandlerRx::rxData(const T &data)
{
if (!m_bWarnedOnce)
{
ERROR_LOG(m_logger) << "No RecvFromTab available";
ERROR_LOG() << "No RecvFromTab available";
m_bWarnedOnce = true;
}
return;
@@ -147,7 +146,7 @@ void HlaHandlerRx::txData(const T &data)
{
if (!m_bWarnedOnceTx)
{
ERROR_LOG(m_logger) << "No RecvFromTab available";
ERROR_LOG() << "No RecvFromTab available";
m_bWarnedOnceTx = true;
}
return;
@@ -46,6 +46,5 @@ private:
bool m_bWarnedOnceTx;
AesHandler* m_aesHandler;
PpmHandler* m_ppmHandler;
LOGGER_T m_logger;
};
}
@@ -15,7 +15,6 @@ HlaHandlerTx::HlaHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp, PpmHandl
, m_pdmHandler(pdmHandler)
, m_webSocket(nullptr)
, m_bHlaConnectedToExternalSystem(false)
, m_logger(getLogger("HlaHandlerTx"))
{}
void HlaHandlerTx::onWebSocketConnected(QWebSocket *webSocket)
@@ -297,7 +296,7 @@ bool HlaHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunitio
void HlaHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
{
INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
<< ", communication possible: " << dataCommunicationPossible;
if (equipmentNumber == -1)
m_dataCommunicationPossible.clear();
@@ -309,7 +308,7 @@ void HlaHandlerTx::onGenericTelegram(const QJsonObject &telegram)
if (!m_webSocket || !m_bHlaConnectedToExternalSystem)
return;
const QByteArray ba = QJsonDocument(telegram).toJson(QJsonDocument::Compact);
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
DEBUG_LOG() << "Sending tele: " << ba;
m_webSocket->sendTextMessage(QString::fromUtf8(ba));
}
@@ -82,9 +82,5 @@ private:
PdmHandler* m_pdmHandler;
QWebSocket *m_webSocket;
bool m_bHlaConnectedToExternalSystem;
LOGGER_T m_logger;
};
}
@@ -20,11 +20,10 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_mainHandlerTx(nullptr)
, m_pdp(pdp)
, m_settings(settings)
, m_logger(getLogger("MainDispatcher"))
, m_domainId(pdp->domainId())
, m_exerciseId(pdp->exerciseId())
{
INFO_LOG(m_logger) << "ApHla started, Domain Id: " << m_domainId << " ExerciseId: " << m_exerciseId;
INFO_LOG() << "ApHla started, Domain Id: " << m_domainId << " ExerciseId: " << m_exerciseId;
}
MainDispatcher::~MainDispatcher()
@@ -5,7 +5,7 @@
#include <QObject>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <DDS/Core/function_reply_object.h>
#include <DDS/Core/core_types.h>
#include "dds_handler.h"
#include "logger.h"
#include "ppm_handler.h"
@@ -72,8 +72,6 @@ private:
std::shared_ptr<PdmHandler> m_pdmHandler;
std::shared_ptr<AesHandler> m_aesHandler;
std::shared_ptr<DdsHandler> m_ddsHandler;
NGL::INGLLogger &m_logger;
int m_domainId;
int m_exerciseId;
};
@@ -10,7 +10,6 @@ namespace ApHlaJson
{
MainHandlerTx::MainHandlerTx(const std::shared_ptr<HlaHandlerTx> &hlaTx)
: m_hlaHandlerTx(hlaTx)
, m_logger(getLogger("MainHandlerTx"))
{}
SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
@@ -65,6 +65,5 @@ private:
bool sendToTxMixin(const T *data);
private:
std::shared_ptr<HlaHandlerTx> m_hlaHandlerTx;
LOGGER_T m_logger;
};
}
@@ -12,7 +12,6 @@ namespace ApHlaJson
PdmHandler::PdmHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("PdmHandler"))
{}
bool PdmHandler::init(MainDispatcher* mainDispatcher)
@@ -21,7 +20,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
if (!m_dtcPdm->enableChargeType())
{
ERROR_LOG(m_logger) << "Can not read data from Pdm";
ERROR_LOG() << "Can not read data from Pdm";
return false;
}
@@ -37,7 +36,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
void PdmHandler::getChargeTypes()
{
DEBUG_LOG(m_logger) << "Get Charge Types";
DEBUG_LOG() << "Get Charge Types";
QJsonObject obj;
QJsonArray dataArray;
obj[QStringLiteral("type")] = QStringLiteral("ApacheHlaSendChargeTypes");
@@ -47,7 +46,7 @@ void PdmHandler::getChargeTypes()
QMap<qint32, ProjectDataManagement::ChargeType> chargeTypes = m_dtcPdm->chargeTypes();
QMap<qint32, ProjectDataManagement::GearType> gearTypes = m_dtcPdm->gearTypes();
QMap<qint32, ProjectDataManagement::GearTypeChargeType> gearTypeChargeTypes = m_dtcPdm->gearTypeChargeTypes();
DEBUG_LOG(m_logger) << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
DEBUG_LOG() << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
{
@@ -30,9 +30,6 @@ public slots:
private:
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
LOGGER_T m_logger;
};
}
@@ -13,7 +13,6 @@ namespace ApHlaJson
PpmHandler::PpmHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("PpmHandler"))
{}
bool PpmHandler::init(MainDispatcher* mainDispatcher)
@@ -25,7 +24,7 @@ bool PpmHandler::init(MainDispatcher* mainDispatcher)
if (!m_dtcPpm->enableParticipant() || !m_dtcPpm->enableDynamicParticipantData() || !m_dtcPpm->enableParticipantPosition())
{
ERROR_LOG(m_logger) << "Can not read data from Ppm";
ERROR_LOG() << "Can not read data from Ppm";
return false;
}
@@ -36,9 +36,6 @@ private slots:
private:
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
LOGGER_T m_logger;
QHash<int, int> m_participantIdsByEqNo;
};