lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
+25 -25
View File
@@ -36,7 +36,7 @@ Device::~Device()
void Device::reOpen()
{
DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::reOpen";
DEBUG_LOG() << "ConnectionHandlerSerial::reOpen";
close();
QTimer::singleShot(2000, this, &Device::open);
}
@@ -52,19 +52,19 @@ bool Device::open()
m_socket->connectToHost(Settings::hostName(), Settings::portTtci());
if (!m_socket->waitForConnected())
{
ERROR_LOG(m_logger) << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
ERROR_LOG() << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
return false;
}
connect(m_socket, &QTcpSocket::readyRead, this, &Device::onDataAvailable);
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), this, &Device::handleError);
connect(m_socket, &QTcpSocket::disconnected, this, &Device::open);
DEBUG_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" << Settings::portTtci();
DEBUG_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" << Settings::portTtci();
}
else
{
m_serialPort = m_spQuerry->currentSerialPort();
DEBUG_LOG(m_logger) << "(Re)openend serial destination " << m_serialPort->portName() << ":";
DEBUG_LOG() << "(Re)openend serial destination " << m_serialPort->portName() << ":";
connect(m_serialPort, &QSerialPort::readyRead, this, &Device::onDataAvailable);
@@ -79,7 +79,7 @@ bool Device::close()
{
if (m_socket->isOpen())
m_socket->close();
DEBUG_LOG(m_logger) << "Closing TCP Port";
DEBUG_LOG() << "Closing TCP Port";
delete m_socket;
m_socket = nullptr;
m_receiveTimeoutTimer->stop();
@@ -110,7 +110,7 @@ void Device::onDataAvailable()
void Device::parseBuffer()
{
DEBUG_LOG(m_logger) << "Buffer - size: " << m_buffer.size()
DEBUG_LOG() << "Buffer - size: " << m_buffer.size()
<< ", data: " << m_buffer.toHex() ;
@@ -118,21 +118,21 @@ void Device::parseBuffer()
int idxStart = -1;
while ((idxStart = m_buffer.indexOf(0x02)) >= 0)
{
TRACE_LOG(m_logger) << "idxStart: " << idxStart ;
TRACE_LOG() << "idxStart: " << idxStart ;
int idxLen = idxStart + 1;
if (idxLen >= m_buffer.size())
return;
unsigned char len = static_cast<unsigned char>(m_buffer.at(idxLen));
TRACE_LOG(m_logger) << "idxLen: " << idxLen
TRACE_LOG() << "idxLen: " << idxLen
<< ", len: " << len
<< " = 0x" << QByteArray::number(len, 16);
int idxCrc = idxLen + len + 1;
int idxEnd = idxCrc + 1;
if (idxEnd >= m_buffer.size())
return;
TRACE_LOG(m_logger) << "idxCrc: " << idxCrc
TRACE_LOG() << "idxCrc: " << idxCrc
<< ", idxEnd: " << idxEnd ;
if (idxEnd >= m_buffer.size())
return;
@@ -141,7 +141,7 @@ void Device::parseBuffer()
if (m_buffer.at(idxEnd) != 0x03)
{
WARNING_LOG(m_logger) << "Could not find valid end marker - searching new start marker"
WARNING_LOG() << "Could not find valid end marker - searching new start marker"
;
m_buffer = m_buffer.mid(1);
continue;
@@ -149,12 +149,12 @@ void Device::parseBuffer()
unsigned char crc = static_cast<unsigned char>(m_buffer.at(idxCrc));
unsigned char crcCalc = calcChecksum(m_buffer.mid(idxStart, idxCrc - idxStart));
TRACE_LOG(m_logger) << "crc: " << crc
TRACE_LOG() << "crc: " << crc
<< ", calculated: " << crcCalc
;
if (crc != crcCalc)
{
WARNING_LOG(m_logger) << "Invalid checksum - is: " << crcCalc
WARNING_LOG() << "Invalid checksum - is: " << crcCalc
<< " - should be: " << crc ;
}
@@ -163,15 +163,15 @@ void Device::parseBuffer()
if (len == 255 || !m_payload.isEmpty())
{
DEBUG_LOG(m_logger) << "telegram with more than 254 bytes ..." ;
DEBUG_LOG() << "telegram with more than 254 bytes ..." ;
if (len == 255 && m_payload.isEmpty())
DEBUG_LOG(m_logger) << "Remember the payload destination: " << destination ;
DEBUG_LOG() << "Remember the payload destination: " << destination ;
m_payload += payload;
if (len != 255)
{
DEBUG_LOG(m_logger) << "destination: " << destination
DEBUG_LOG() << "destination: " << destination
<< ", data: " << m_payload.toHex() ;
emit dataAvailable(m_payload);
m_payload.clear();
@@ -180,7 +180,7 @@ void Device::parseBuffer()
else
{
DEBUG_LOG(m_logger) << "destination: " << destination
DEBUG_LOG() << "destination: " << destination
<< ", data: " << payload.toHex() ;
emit dataAvailable(payload);
}
@@ -197,7 +197,7 @@ bool Device::writeData(const QChar destination, const QByteArray &payload)
if ((m_tcpMode && !m_socket->isOpen()) || (!m_tcpMode && !m_serialPort->isOpen()))
return false;
DEBUG_LOG(m_logger) << "Writing " << payload.size()
DEBUG_LOG() << "Writing " << payload.size()
<< " Bytes to channel " << destination ;
QByteArray data = payload;
@@ -215,7 +215,7 @@ bool Device::writeData(const QChar destination, const QByteArray &payload)
buf.append(calcChecksum(buf));
buf.append(0x03);
DEBUG_LOG(m_logger) << "Writing: " << buf.toHex() ;
DEBUG_LOG() << "Writing: " << buf.toHex() ;
if (m_tcpMode)
m_socket->write(buf);
else
@@ -245,7 +245,7 @@ unsigned char Device::calcChecksum(const QByteArray &checksumData)
void Device::handleError(QAbstractSocket::SocketError error)
{
DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
const QString errStr(QStringLiteral("QTcpSocket::SocketError ") + QString::number(error) +
QStringLiteral(" from tcp port ") + QString::number(m_socket->peerPort()) +
@@ -257,20 +257,20 @@ void Device::handleError(QAbstractSocket::SocketError error)
case QTcpSocket::SocketError::SocketAccessError:
case QTcpSocket::SocketError::SocketResourceError:
{
ERROR_LOG(m_logger) << "Closing port trying to reopen it.";
ERROR_LOG() << "Closing port trying to reopen it.";
close();
m_restartTimer->start();
Q_FALLTHROUGH();
}
case QTcpSocket::SocketError::RemoteHostClosedError:
{
ERROR_LOG(m_logger) << "Host closed trying to reopen.";
ERROR_LOG() << "Host closed trying to reopen.";
m_restartTimer->start();
break;
}
default:
{
ERROR_LOG(m_logger) << errStr;
ERROR_LOG() << errStr;
close();
m_restartTimer->start();
break;
@@ -280,7 +280,7 @@ void Device::handleError(QAbstractSocket::SocketError error)
void Device::handleSerialError(QSerialPort::SerialPortError error)
{
DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
const QString errStr(QStringLiteral("QSerialPort::SerialPortError ") + QString::number(error) +
QStringLiteral(" error: ") + m_serialPort->errorString());
@@ -293,13 +293,13 @@ void Device::handleSerialError(QSerialPort::SerialPortError error)
case QSerialPort::SerialPortError::PermissionError:
case QSerialPort::SerialPortError::WriteError:
{
WARNING_LOG(m_logger) << "Closing port trying to reopen it.";
WARNING_LOG() << "Closing port trying to reopen it.";
m_restartTimer->start();
Q_FALLTHROUGH();
}
default:
{
WARNING_LOG(m_logger) << errStr;
WARNING_LOG() << errStr;
m_restartTimer->start();
break;
}