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
+9
-10
@@ -17,7 +17,6 @@ WebsocketHandler::WebsocketHandler(QObject *parent, int exerciseId,
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_dtsTaboc(dtsTabOc)
|
||||
, m_dtcTaboc(dtcTabOc)
|
||||
, m_logger(getLogger("WebSocketHandler"))
|
||||
{
|
||||
m_tryConnectionTimer = new QTimer(this);
|
||||
connect(m_tryConnectionTimer, &QTimer::timeout, this, &WebsocketHandler::onTryConnectionTimerTimeout);
|
||||
@@ -132,12 +131,12 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
|
||||
QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
|
||||
if (!doc.isObject())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Valid Object in " << message;
|
||||
WARNING_LOG() << "No Valid Object in " << message;
|
||||
return;
|
||||
}
|
||||
if (doc.object().value(QStringLiteral("data")).toObject().isEmpty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Data Array in" << message;
|
||||
WARNING_LOG() << "No Data Array in" << message;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -150,7 +149,7 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
|
||||
|
||||
if (obj.contains(QStringLiteral("lon")) && obj.contains(QStringLiteral("lat")))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got message with position";
|
||||
DEBUG_LOG() << "Got message with position";
|
||||
outData.position(Core::GeoPosition(obj.value(QStringLiteral("lon")).toDouble(),obj.value(QStringLiteral("lat")).toDouble(),obj.value(QStringLiteral("height")).toDouble()));
|
||||
outData.timeStamp(QDateTime::currentMSecsSinceEpoch());
|
||||
if (obj.contains(QStringLiteral("buildingId")) && obj.contains(QStringLiteral("roomId")) )
|
||||
@@ -169,32 +168,32 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
|
||||
void WebsocketHandler::connectToServer()
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "Try connect to servicemanagement " << QUrl(QStringLiteral("ws://")+Settings::remoteServerHostname()+QStringLiteral(":")+ QString::number(7300)).toString();
|
||||
DEBUG_LOG() << "Try connect to servicemanagement " << QUrl(QStringLiteral("ws://")+Settings::remoteServerHostname()+QStringLiteral(":")+ QString::number(7300)).toString();
|
||||
m_socket->open(QUrl(QStringLiteral("ws://")+Settings::remoteServerHostname()+QStringLiteral(":")+ QString::number(7300)));
|
||||
}
|
||||
|
||||
void WebsocketHandler::sendServicePortRequest()
|
||||
{
|
||||
m_socket->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
|
||||
DEBUG_LOG(m_logger) << "Wait For Services Reply";
|
||||
DEBUG_LOG() << "Wait For Services Reply";
|
||||
}
|
||||
|
||||
void WebsocketHandler::parseServices(const QString &message)
|
||||
{
|
||||
m_tryConnectionTimer->stop();
|
||||
|
||||
DEBUG_LOG(m_logger) << "Received SERVICES MESSAGE: " << message;
|
||||
DEBUG_LOG() << "Received SERVICES MESSAGE: " << message;
|
||||
m_socket->close();
|
||||
int exPort = -1;
|
||||
QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
|
||||
if (!doc.isObject())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Valid Object in " << message;
|
||||
WARNING_LOG() << "No Valid Object in " << message;
|
||||
return;
|
||||
}
|
||||
if (!doc.object().value(QStringLiteral("data")).isArray())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Data Array in" << message;
|
||||
WARNING_LOG() << "No Data Array in" << message;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -228,7 +227,7 @@ void WebsocketHandler::parseServices(const QString &message)
|
||||
|
||||
if (exPort > 0)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Connect To ppm ON: " << exPort;
|
||||
DEBUG_LOG() << "Connect To ppm ON: " << exPort;
|
||||
connectToExPPM(exPort);
|
||||
m_state = WebSocketState::CONNECTTOPPM;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user