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

@@ -13,7 +13,6 @@ namespace TrainingAreaBaseOC
ConnectionHandlerSerial::ConnectionHandlerSerial()
: m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
, m_receiveTimeoutTimer(new QTimer(this))
, m_logger(getLogger("ConnectionHandlerSerial"))
{
connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
m_spQuerry->restartQuerry();
@@ -35,25 +34,25 @@ bool ConnectionHandlerSerial::send(const LtsUtils::SfmMessage &message)
if (!m_serialPort->isOpen())
{
ERROR_LOG(m_logger) << "Port is not opened!";
ERROR_LOG() << "Port is not opened!";
return false;
}
QByteArray data = LtsUtils::byteStreamFromSfmMessage(message);
DEBUG_LOG(m_logger) << "Sending frame: " << data.toHex(' ');
DEBUG_LOG() << "Sending frame: " << data.toHex(' ');
const qint64 byteswritten = m_serialPort->write(data);
m_serialPort->flush();
if (byteswritten == -1)
{
ERROR_LOG(m_logger) << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
ERROR_LOG() << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
return false;
}
else if (byteswritten != data.size())
{
ERROR_LOG(m_logger) << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
ERROR_LOG() << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
return false;
}
@@ -84,7 +83,7 @@ void ConnectionHandlerSerial::read()
const QByteArray ba = m_serialPort->readAll();
m_currentDataRead.append(ba);
DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
int idxStart = -1;
int idxEnd = -1;
@@ -95,21 +94,21 @@ void ConnectionHandlerSerial::read()
QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
LtsUtils::SfmMessage sfmMsg;
DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
try
{
sfmMsg = LtsUtils::byteStreamToSfmMessage(message);
}
catch (const LtsUtils::ConversionError &ex)
{
ERROR_LOG(m_logger) << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
ERROR_LOG(m_logger) << "Faulty Data from sfm as binary " << message.toHex();
ERROR_LOG() << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
ERROR_LOG() << "Faulty Data from sfm as binary " << message.toHex();
m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
continue;
}
INFO_LOG(m_logger) << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
INFO_LOG() << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
m_receiveTimeoutTimer->start();
@@ -119,7 +118,7 @@ void ConnectionHandlerSerial::read()
}
if (m_serialPort->bytesAvailable() > 0)
DEBUG_LOG(m_logger) << "Still " << m_serialPort->bytesAvailable() << " available to be read";
DEBUG_LOG() << "Still " << m_serialPort->bytesAvailable() << " available to be read";
}