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 @@ NmeaHandler::NmeaHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent)
: QObject(parent)
, m_ddsHandler(ddsHandler)
, m_logger(getLogger("NmeaHandler"))
{
}
@@ -66,29 +65,29 @@ void NmeaHandler::IIXDR(QString package)
NmeaManagement::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_def::PRESHUTDOWN);
}
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
serviceControl.ServiceControlState(ServiceControlEnum_def::SHUTDOWN);
}
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
INFO_LOG() << "SERVICE_CONTROL_STOP";
serviceControl.ServiceControlState(ServiceControlEnum_def::STOP);
}
m_ddsHandler->dts()->publish(serviceControl);
@@ -161,7 +160,7 @@ void NmeaHandler::IIXDR(QString package)
batteryState.voltage(voltage);
batteryState.serialNumber(serialNumber.toStdString()) ;
INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
m_ddsHandler->dts()->publish(batteryState);
}
@@ -188,10 +187,10 @@ void NmeaHandler::IIALR(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();
// 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];
// }
packageData.time = pkt_data[1];
packageData.number = pkt_data[2].toInt();
@@ -207,7 +206,7 @@ void NmeaHandler::IIALR(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
@@ -277,10 +276,10 @@ void NmeaHandler::GPGGA(QString package)
if (packageData.C_latitude_dir == 'S' || packageData.C_latitude_dir == 's')
latDecimal = ((real / 60) + inteiro) * -1;
//INFO_LOG(m_logger) << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
//INFO_LOG() << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
else
latDecimal = ((real / 60) + inteiro);
//INFO_LOG(m_logger) << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
//INFO_LOG() << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
while (packageData.D_longitude[0] == QStringLiteral("0"))
@@ -301,7 +300,7 @@ void NmeaHandler::GPGGA(QString package)
lonDecimal = ((real / 60) + inteiro);
}
INFO_LOG(m_logger) << "longitude=" << lonDecimal
INFO_LOG() << "longitude=" << lonDecimal
<< " latitude=" << latDecimal;
@@ -333,7 +332,7 @@ void NmeaHandler::GPRMC(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);
}
@@ -358,7 +357,7 @@ void NmeaHandler::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"))
{
@@ -367,10 +366,10 @@ void NmeaHandler::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);
}
}