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:
2785 files changed
+18754
-18316
No files matched your search
+24
-25
@@ -20,7 +20,6 @@ ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent)
|
||||
, m_socket(nullptr)
|
||||
, m_timer(new QTimer(this))
|
||||
, m_currentDataRead(QByteArray())
|
||||
, m_logger(getLogger("ConnectionHandlerTcp"))
|
||||
{
|
||||
m_timer->setInterval(5000);
|
||||
connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
|
||||
@@ -55,27 +54,27 @@ bool ConnectionHandlerTcp::send(const QByteArray &message)
|
||||
|
||||
if (!m_socket->isOpen())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Port is not opened!";
|
||||
ERROR_LOG() << "Port is not opened!";
|
||||
return false;
|
||||
}
|
||||
|
||||
const QByteArray writeThis = LtsUtils::byteStreamFromEscMessage(message);
|
||||
DEBUG_LOG(m_logger) << "Send HEX:" << writeThis.toHex(' ');
|
||||
DEBUG_LOG() << "Send HEX:" << writeThis.toHex(' ');
|
||||
qint64 byteswritten = m_socket->write(writeThis);
|
||||
DEBUG_LOG(m_logger) << "Binary data:" << message.size();
|
||||
DEBUG_LOG(m_logger) << "Try sending: " << message.size();
|
||||
DEBUG_LOG() << "Binary data:" << message.size();
|
||||
DEBUG_LOG() << "Try sending: " << message.size();
|
||||
|
||||
// Check for errors ---------------------------------------------
|
||||
|
||||
if (byteswritten == -1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
|
||||
ERROR_LOG() << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
|
||||
m_timer->start();
|
||||
return false;
|
||||
}
|
||||
else if (byteswritten != writeThis.size())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
|
||||
ERROR_LOG() << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -88,10 +87,10 @@ bool ConnectionHandlerTcp::open()
|
||||
m_socket->connectToHost(Settings::hostName(), Settings::port());
|
||||
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;
|
||||
}
|
||||
INFO_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort();
|
||||
INFO_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -110,8 +109,8 @@ void ConnectionHandlerTcp::read()
|
||||
const QByteArray ba = m_socket->readAll();
|
||||
m_currentDataRead.append(ba);
|
||||
|
||||
//DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
|
||||
DEBUG_LOG(m_logger) << "Data size" << ba.size();
|
||||
//DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
|
||||
DEBUG_LOG() << "Data size" << ba.size();
|
||||
int idxStart = -1;
|
||||
int idxEnd = -1;
|
||||
while ((idxStart = m_currentDataRead.indexOf(0x02)) >= 0 &&
|
||||
@@ -123,27 +122,27 @@ void ConnectionHandlerTcp::read()
|
||||
|
||||
QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
|
||||
m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
|
||||
DEBUG_LOG(m_logger) << "Data Message found: " << message.toHex(' ');
|
||||
DEBUG_LOG() << "Data Message found: " << message.toHex(' ');
|
||||
message = LtsUtils::byteStreamToEscMessage(message);
|
||||
|
||||
if (message.size() > 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Message to long: " << message.size();
|
||||
ERROR_LOG() << "Message to long: " << message.size();
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
|
||||
DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
|
||||
//got message now remove frame
|
||||
|
||||
|
||||
unsigned int byte = 0;
|
||||
byte = message.at(0) & 0xFF;
|
||||
DEBUG_LOG(m_logger) << "ConnectionHandler::read var byte is" << byte;
|
||||
DEBUG_LOG() << "ConnectionHandler::read var byte is" << byte;
|
||||
|
||||
|
||||
if (!isValidCommandByte(byte))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ConnectionHandler::read Commandbyte is invalid. Returning";
|
||||
ERROR_LOG() << "ConnectionHandler::read Commandbyte is invalid. Returning";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -154,29 +153,29 @@ void ConnectionHandlerTcp::read()
|
||||
if (message.size() > 1 &&
|
||||
!isValidPayloadByte(message.at(1)))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ConnectionHandler::read Payloadbyte is invalid. Returning";
|
||||
ERROR_LOG() << "ConnectionHandler::read Payloadbyte is invalid. Returning";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (message.size() != 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ConnectionHandler::read No 2nd byte was appended (QByteArray has bad size). Returning.";
|
||||
ERROR_LOG() << "ConnectionHandler::read No 2nd byte was appended (QByteArray has bad size). Returning.";
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Binary data from serial port: " << message.toHex(' ');
|
||||
DEBUG_LOG() << "Binary data from serial port: " << message.toHex(' ');
|
||||
|
||||
emit received(message);
|
||||
}
|
||||
|
||||
if (m_socket->bytesAvailable() > 0)
|
||||
DEBUG_LOG(m_logger) << "Still " << m_socket->bytesAvailable() << " available to be read";
|
||||
DEBUG_LOG() << "Still " << m_socket->bytesAvailable() << " available to be read";
|
||||
}
|
||||
|
||||
void ConnectionHandlerTcp::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()) +
|
||||
@@ -188,20 +187,20 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
|
||||
case QTcpSocket::SocketError::SocketAccessError:
|
||||
case QTcpSocket::SocketError::SocketResourceError:
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Closing port WITHOUT trying to reopen it.";
|
||||
ERROR_LOG() << "Closing port WITHOUT trying to reopen it.";
|
||||
close();
|
||||
m_timer->start();
|
||||
Q_FALLTHROUGH();
|
||||
}
|
||||
case QTcpSocket::SocketError::RemoteHostClosedError:
|
||||
{
|
||||
ERROR_LOG(m_logger) << errStr;
|
||||
ERROR_LOG() << errStr;
|
||||
m_timer->start();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
ERROR_LOG(m_logger) << errStr;
|
||||
ERROR_LOG() << errStr;
|
||||
close();
|
||||
m_timer->start();
|
||||
break;
|
||||
@@ -211,7 +210,7 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
|
||||
|
||||
bool ConnectionHandlerTcp::isValidCommandByte(const unsigned char command)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConnectionHandler::isValidCommandByte" << command << (command == 192 ||
|
||||
DEBUG_LOG() << "ConnectionHandler::isValidCommandByte" << command << (command == 192 ||
|
||||
command == 240 ||
|
||||
command == 244 ||
|
||||
command == 255 ||
|
||||
|
||||
Reference in new issue
Block a user