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

@@ -21,7 +21,6 @@ ConnectionHandlerTcpTtci::ConnectionHandlerTcpTtci()
, m_segmentToggle(0)
, m_canDevice(new Device(this))
, m_canChannel(new Channel(QLatin1Char('@'), true, this))
, m_logger(getLogger("TTCI"))
{
connect(m_canChannel, &Channel::dataAvailable, this, &ConnectionHandlerTcpTtci::slotReadCanFrame);
connect(m_canChannel, &Channel::disconnectedFromEq, this, &ConnectionHandlerTcpTtci::disconnectedFromEq);
@@ -43,7 +42,7 @@ bool ConnectionHandlerTcpTtci::init()
void ConnectionHandlerTcpTtci::initCanSocket()
{
ERROR_LOG(m_logger) << "InitCantSOcket";
ERROR_LOG() << "InitCantSOcket";
m_canChannel->setDevice(m_canDevice);
m_canDevice->open();
@@ -54,10 +53,10 @@ bool ConnectionHandlerTcpTtci::findNextSyncByte(int &iCurReadPos) const
{
if (iCurReadPos == m_buffer.size())
{
DEBUG_LOG(m_logger) << "No more data available";
DEBUG_LOG() << "No more data available";
return false;
}
DEBUG_LOG(m_logger) << "Searching for next sync byte, start at: " << iCurReadPos;
DEBUG_LOG() << "Searching for next sync byte, start at: " << iCurReadPos;
NGL::NGLLoggerHelper::hexDumpHelper(m_logger, NGL::LogLevel::Debug, m_buffer);
while (iCurReadPos < m_buffer.size())
@@ -71,7 +70,7 @@ bool ConnectionHandlerTcpTtci::findNextSyncByte(int &iCurReadPos) const
if (m_buffer.size() < 4 + iCurReadPos)
{
DEBUG_LOG(m_logger) << "Could not find sync byte in stream";
DEBUG_LOG() << "Could not find sync byte in stream";
return false;
}
return true;
@@ -84,11 +83,11 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
int iCurReadPos = 0;
while (findNextSyncByte(iCurReadPos))
{
DEBUG_LOG(m_logger) << "Found Sync byte at " << iCurReadPos;
DEBUG_LOG() << "Found Sync byte at " << iCurReadPos;
unsigned int len = (m_buffer.at(iCurReadPos + 1) & 0xF0) >> 4;
DEBUG_LOG(m_logger) << "Payload size: " << len;
DEBUG_LOG() << "Payload size: " << len;
if (len > 8)
{
@@ -97,22 +96,22 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
{
case 9:
DEBUG_LOG(m_logger) << "Read status data - skipping ";
DEBUG_LOG() << "Read status data - skipping ";
iCurReadPos += 4;
break;
case 11:
DEBUG_LOG(m_logger) << "Read communication SFM - PAN - skipping ";
DEBUG_LOG() << "Read communication SFM - PAN - skipping ";
iCurReadPos += 5;
break;
case 12:
DEBUG_LOG(m_logger) << "Read parameter request - skipping ";
DEBUG_LOG() << "Read parameter request - skipping ";
iCurReadPos += 5;
break;
default:
WARNING_LOG(m_logger) << "Invalid payload size (" << len << " - skipping";
WARNING_LOG() << "Invalid payload size (" << len << " - skipping";
++iCurReadPos;
break;
}
@@ -125,7 +124,7 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
int neededBytes = 4 + len + iCurReadPos;
if (m_buffer.size() < neededBytes)
{
INFO_LOG(m_logger) << "To few bytes in buffer - waiting for more (want: "
INFO_LOG() << "To few bytes in buffer - waiting for more (want: "
<< neededBytes << " have: " << m_buffer.size() << ")";
break;
@@ -135,7 +134,7 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
unsigned char id2 = m_buffer.at(iCurReadPos + 2);
id = ((id << 8) + id2);
bool rtr = ((m_buffer.at(iCurReadPos + 1) & 0x08) == 0x08);
DEBUG_LOG(m_logger) << "CAN ID: " << id << " rtr: " << rtr;
DEBUG_LOG() << "CAN ID: " << id << " rtr: " << rtr;
unsigned char crc = 0;
@@ -147,7 +146,7 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
if (crc != crcSent)
{
WARNING_LOG(m_logger) << "CRC checksum missmatch (is: " << crcSent
WARNING_LOG() << "CRC checksum missmatch (is: " << crcSent
<< " - calculated: " << crc << ") - skipping";
iCurReadPos++;
continue;
@@ -180,7 +179,7 @@ bool ConnectionHandlerTcpTtci::send(const LtsUtils::SfmMessage &message)
if (message.payload().size() > 8)
return false;
INFO_LOG(m_logger) << "start write";
INFO_LOG() << "start write";
NGL::NGLLoggerHelper::hexDumpHelper(m_logger, NGL::LogLevel::Debug, message.payload());
QByteArray data(message.payload().size() + 4, Qt::Uninitialized);
@@ -197,10 +196,10 @@ bool ConnectionHandlerTcpTtci::send(const LtsUtils::SfmMessage &message)
crc += data.at(i);
crc = ~crc;
data[message.payload().size() + 3] = crc;
INFO_LOG(m_logger) << "end write ";
INFO_LOG() << "end write ";
if (!m_canChannel->writeData(data))
ERROR_LOG(m_logger) << "Error writing data to can channel";
ERROR_LOG() << "Error writing data to can channel";
return true;
}