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
@@ -23,7 +23,6 @@ SocketHandler::SocketHandler(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
, TurnRadioMasterOffRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_nmeaHandler(nmeaHandler)
|
||||
, m_logger(getLogger("SocketHandler"))
|
||||
{
|
||||
// create a timer
|
||||
m_reconnectTimer = new QTimer(this);
|
||||
@@ -45,8 +44,8 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
|
||||
|
||||
INFO_LOG(m_logger) << "Connecting,..";
|
||||
INFO_LOG(m_logger) << nmeaHost << " port: " << nmeaPort;
|
||||
INFO_LOG() << "Connecting,..";
|
||||
INFO_LOG() << nmeaHost << " port: " << nmeaPort;
|
||||
//socket->connectToHost(QHostAddress::LocalHost, nmeaPort);
|
||||
//socket->connectToHost(nmeaHost, nmeaPort);
|
||||
reconnect();
|
||||
@@ -55,12 +54,12 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
void SocketHandler::reconnect()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
|
||||
INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;;
|
||||
|
||||
if(!socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error from Socket: " << socket->errorString();
|
||||
ERROR_LOG() << "Error from Socket: " << socket->errorString();
|
||||
m_reconnectTimer->start(10000);
|
||||
}
|
||||
|
||||
@@ -70,24 +69,24 @@ void SocketHandler::connected()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
|
||||
INFO_LOG(m_logger) << "Connected!";
|
||||
INFO_LOG() << "Connected!";
|
||||
}
|
||||
|
||||
|
||||
void SocketHandler::disconnected()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Disconnected!";
|
||||
INFO_LOG() << "Disconnected!";
|
||||
}
|
||||
|
||||
void SocketHandler::bytesWritten(qint64 bytes)
|
||||
{
|
||||
TRACE_LOG(m_logger) << "We wrote: " << bytes;
|
||||
TRACE_LOG() << "We wrote: " << bytes;
|
||||
}
|
||||
|
||||
void SocketHandler::reconnectTimerSlot()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
|
||||
INFO_LOG() << "Reconnect NMEA-Socket "
|
||||
<< " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;
|
||||
reconnect();
|
||||
@@ -97,7 +96,7 @@ void SocketHandler::reconnectTimerSlot()
|
||||
void SocketHandler::readyRead()
|
||||
{
|
||||
bool hasData = true;
|
||||
INFO_LOG(m_logger) << "Reading...";
|
||||
INFO_LOG() << "Reading...";
|
||||
// QByteArray ba = socket->readDatagram();
|
||||
|
||||
QByteArray ba;
|
||||
@@ -107,18 +106,18 @@ void SocketHandler::readyRead()
|
||||
|
||||
ba.resize(int(socket->pendingDatagramSize()));
|
||||
socket->readDatagram(ba.data(), ba.size());
|
||||
INFO_LOG(m_logger) << ba;
|
||||
INFO_LOG() << ba;
|
||||
QByteArray nmeaDataBa = ba; // ba.mid(startNmeaData, endNmeaData);
|
||||
std::string nmeaDataStd = nmeaDataBa.toStdString() ;
|
||||
QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
|
||||
INFO_LOG() << "nmeaDecoder :" << nmeaData;
|
||||
//ba = ba.mid(endNmeaData, ba.length());
|
||||
m_nmeaHandler->decode(nmeaData);
|
||||
|
||||
INFO_LOG(m_logger) << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG(m_logger) << "NMEA-Data ba=" << ba;
|
||||
INFO_LOG() << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG() << "NMEA-Data ba=" << ba;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +127,7 @@ void SocketHandler::onTurnRadioMasterOffRequest(const rti::core::SampleIdentity
|
||||
|
||||
Core::FunctionReplyObject reply;
|
||||
if (reply.error())
|
||||
WARNING_LOG(m_logger) << "onTurnRadioMasterOffReply: " << reply();
|
||||
WARNING_LOG() << "onTurnRadioMasterOffReply: " << reply();
|
||||
|
||||
m_ddsHandler->fts()->turnRadioMasterOffReply(cookie, reply);
|
||||
|
||||
|
||||
Reference in new issue
Block a user