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

@@ -18,7 +18,6 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_mainHandlerTx(std::make_shared<MainHandlerTx>(
std::dynamic_pointer_cast<NmeaHandlerTx>(m_tetraDispatcher->sendToTab())))
, m_settings(settings)
, m_logger(getLogger("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 "logger.h"
namespace Nmea
@@ -35,8 +35,5 @@ private:
NGL::Settings *m_settings;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
std::shared_ptr<TrainingAreaBase::SendToTab> m_mainHandlerTx;
NGL::INGLLogger &m_logger;
};
}
@@ -12,7 +12,6 @@ namespace Nmea
MainHandlerTx::MainHandlerTx(
const std::shared_ptr<NmeaHandlerTx> &nmeaTx)
: m_nmeaHandlerTx(nmeaTx)
, m_logger(getLogger("MainHandlerTx"))
{}
SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
@@ -66,7 +66,5 @@ private:
bool sendToTxMixin(const T *data);
private:
std::shared_ptr<NmeaHandlerTx> m_nmeaHandlerTx;
LOGGER_T m_logger;
};
}
@@ -17,7 +17,6 @@ NmeaDispatcher::NmeaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_txHandler(std::make_shared<NmeaHandlerTx>())
, m_dataProvider(pdp)
, m_settings(settings)
, m_logger(getLogger("NmeaDispatcher"))
{
m_reconnectTimer = new QTimer(this);
@@ -30,7 +29,7 @@ NmeaDispatcher::NmeaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
m_nmeaHost = getNmeaHost();
m_nmeaPort = getNmeaPort();
DEBUG_LOG(m_logger) << "Host: " << m_nmeaHost << " Port: " << m_nmeaPort;
DEBUG_LOG() << "Host: " << m_nmeaHost << " Port: " << m_nmeaPort;
m_socket = new QUdpSocket(this);
connect(m_socket, &QUdpSocket::connected, this, &NmeaDispatcher::connected);
connect(m_socket, &QUdpSocket::disconnected, this, &NmeaDispatcher::disconnected);
@@ -60,12 +59,12 @@ void NmeaDispatcher::exerciseChanged()
void NmeaDispatcher::reconnect()
{
INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
<< " port = " << m_nmeaPort;;
if(!m_socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress | QAbstractSocket::BindFlag::ReuseAddressHint))
{
ERROR_LOG(m_logger) << "Error from Socket: " << m_socket->errorString();
ERROR_LOG() << "Error from Socket: " << m_socket->errorString();
m_reconnectTimer->start(10000);
}
else
@@ -78,25 +77,25 @@ void NmeaDispatcher::connected()
{
m_reconnectTimer->stop();
m_txHandler->onUdpSocketConnected(m_socket, m_nmeaPort, m_nmeaHost);
DEBUG_LOG(m_logger) << "Connected!";
DEBUG_LOG() << "Connected!";
}
void NmeaDispatcher::disconnected()
{
m_reconnectTimer->start();
DEBUG_LOG(m_logger) << "Disconnected!";
DEBUG_LOG() << "Disconnected!";
}
void NmeaDispatcher::bytesWritten(qint64 bytes)
{
DEBUG_LOG(m_logger) << "We wrote: " << bytes;
DEBUG_LOG() << "We wrote: " << bytes;
}
void NmeaDispatcher::reconnectTimerSlot()
{
m_reconnectTimer->stop();
INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
INFO_LOG() << "Reconnect NMEA-Socket "
<< " host = " << m_nmeaHost
<< " port = " << m_nmeaPort;
reconnect();
@@ -105,7 +104,7 @@ void NmeaDispatcher::reconnectTimerSlot()
void NmeaDispatcher::readyRead()
{
DEBUG_LOG(m_logger) << "Reading...";
DEBUG_LOG() << "Reading...";
QByteArray ba;
@@ -115,18 +114,18 @@ void NmeaDispatcher::readyRead()
ba.resize(int(m_socket->pendingDatagramSize()));
m_socket->readDatagram(ba.data(), ba.size());
INFO_LOG(m_logger) << ba;
INFO_LOG() << ba;
QByteArray nmeaDataBa = ba;
std::string nmeaDataStd = nmeaDataBa.toStdString() ;
QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
DEBUG_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
DEBUG_LOG() << "nmeaDecoder :" << nmeaData;
m_rxHandler->handleTelegram(nmeaData);
DEBUG_LOG(m_logger) << "NMEA-Data=" << nmeaData;
DEBUG_LOG(m_logger) << "NMEA-Data ba=" << ba;
DEBUG_LOG() << "NMEA-Data=" << nmeaData;
DEBUG_LOG() << "NMEA-Data ba=" << ba;
}
}
@@ -10,7 +10,7 @@
#include <QUdpSocket>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <nglsettings/nglsettings_settings.h>
#include <DDS/Core/function_reply_object.h>
#include <DDS/Core/core_types.h>
#include "logger.h"
namespace Nmea
@@ -54,7 +54,6 @@ private:
QString m_nmeaHost;
QUdpSocket *m_socket;
QTimer *m_reconnectTimer;
NGL::INGLLogger &m_logger;
NGL::Settings *m_settings;
};
@@ -14,7 +14,6 @@ namespace Nmea
NmeaHandlerRx::NmeaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler)
: m_rxHandler(rxHandler)
, m_bWarnedOnce(false)
, m_logger(getLogger("TetraHandlerRx"))
{
@@ -49,7 +48,7 @@ void NmeaHandlerRx::decode(QString nmeaPackage)
nmeaPackage.remove(0, startingPoint);
nmeaType = nmeaPackage.mid(1, 5);
INFO_LOG(m_logger) << "nmeaType=" << nmeaType;
INFO_LOG() << "nmeaType=" << nmeaType;
if (nmeaType == QStringLiteral("IIXDR"))
{
@@ -58,10 +57,10 @@ void NmeaHandlerRx::decode(QString nmeaPackage)
if (nmeaType == QStringLiteral("GPGGA"))
{
INFO_LOG(m_logger) << "Eigenposition";
INFO_LOG() << "Eigenposition";
if (checksum(nmeaPackage))
{
INFO_LOG(m_logger) << "Eigenposition checksum ok";
INFO_LOG() << "Eigenposition checksum ok";
GPGGA(nmeaPackage);
}
}
@@ -133,29 +132,29 @@ void NmeaHandlerRx::IIXDR(const QString &package)
ServiceControl serviceControl;
QRegExp sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep);
INFO_LOG(m_logger) << "----------------------------------------------------";
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
INFO_LOG() << "----------------------------------------------------";
INFO_LOG() << "batteryState pkt_data.size=" << pkt_data.size();
for (int i = 0; i < pkt_data.size(); i++)
INFO_LOG(m_logger) << "i=" << i << "Value=" << pkt_data[i];
INFO_LOG() << "i=" << i << "Value=" << pkt_data[i];
int index = pkt_data.indexOf(QLatin1String("S")) + 1;
if ( index >= 1)
{
INFO_LOG(m_logger) << "Ausschalten!!!";
INFO_LOG() << "Ausschalten!!!";
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
INFO_LOG() << "SERVICE_CONTROL_PRESHUTDOWN";
serviceControl.serviceControlState = ServiceControlEnum::PRESHUTDOWN;
}
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
serviceControl.serviceControlState = ServiceControlEnum::SHUTDOWN;
}
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
INFO_LOG() << "SERVICE_CONTROL_STOP";
serviceControl.serviceControlState = ServiceControlEnum::STOP;
}
serviceControl.header.equipmentNumber = 1;
@@ -230,7 +229,7 @@ void NmeaHandlerRx::IIXDR(const QString &package)
batteryState.voltage = voltage;
batteryState.serialNumber = serialNumber;
INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
batteryInfo.batteryStates = {batteryState};
batteryInfo.header.equipmentNumber = 1;
batteryInfo.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -244,7 +243,7 @@ void NmeaHandlerRx::IIALR(const QString &package)
QRegExp sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep);
alarm_state packageData;
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
INFO_LOG() << "pkt_data.size=" << pkt_data.size();
@@ -263,7 +262,7 @@ void NmeaHandlerRx::IIALR(const QString &package)
qint64 timeAlarm = getDateTime(packageData.time);
INFO_LOG(m_logger) << "time=" << packageData.time
INFO_LOG() << "time=" << packageData.time
<< " timeAlarm=" << timeAlarm
<< " number=" << packageData.number
<< " condition=" << packageData.condition
@@ -340,9 +339,9 @@ void NmeaHandlerRx::GPGGA(const QString &package)
lonDeg *= -1;
}
DEBUG_LOG(m_logger) << "RAW Nmea Position: " << packageData.D_longitude << " | " << packageData.B_latitude;
DEBUG_LOG(m_logger) << "Lat: " << latDeg;
DEBUG_LOG(m_logger) << "Lon: " << lonDeg;
DEBUG_LOG() << "RAW Nmea Position: " << packageData.D_longitude << " | " << packageData.B_latitude;
DEBUG_LOG() << "Lat: " << latDeg;
DEBUG_LOG() << "Lon: " << lonDeg;
PositionExcon.geoPosition.lat = latDeg * M_PI / 180.0;
PositionExcon.geoPosition.lon = lonDeg * M_PI / 180.0;
@@ -372,7 +371,7 @@ void NmeaHandlerRx::GPRMC(const QString &package)
packageData.K_variacao_magnetica_coord = pkt_data[11].toStdString()[0];
INFO_LOG(m_logger) << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
INFO_LOG() << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
}
@@ -405,7 +404,7 @@ void NmeaHandlerRx::sendTestMessages()
batteryState.generic = 1;
batteryState.serialNumber = QStringLiteral("Test");
batteryState.temperature = 38.8;
DEBUG_LOG(m_logger) << "Send BatteryInfo Message";
DEBUG_LOG() << "Send BatteryInfo Message";
batteryInfo.batteryStates = {batteryState};
batteryInfo.header.equipmentNumber = 1;
batteryInfo.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -420,7 +419,7 @@ void NmeaHandlerRx::rxData(const T &data)
{
if (!m_bWarnedOnce)
{
ERROR_LOG(m_logger) << "No RecvFromTab available";
ERROR_LOG() << "No RecvFromTab available";
m_bWarnedOnce = true;
}
return;
@@ -125,7 +125,6 @@ private:
protected:
const std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
bool m_bWarnedOnce;
NGL::INGLLogger &m_logger;
};
}
@@ -13,7 +13,6 @@ NmeaHandlerTx::NmeaHandlerTx()
, m_udpSocket(nullptr)
, m_nmeaHost(QStringLiteral("localhost"))
, m_nmeaPort(10110)
, m_logger(getLogger("NmeaHandlerTx"))
{
resetSendCounter();
}
@@ -74,7 +74,6 @@ private:
int m_nmeaPort;
int m_sendCounter = 1;
bool m_bConnected = false;
NGL::INGLLogger &m_logger;
};