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
@@ -29,7 +29,6 @@ MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(nullptr)
|
||||
, m_handlerWebSocket(nullptr)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
@@ -121,7 +120,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
|
||||
if (m_interfaces.empty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not load any training area plugin - can not send data to training area";
|
||||
WARNING_LOG() << "Could not load any training area plugin - can not send data to training area";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -132,15 +131,15 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
|
||||
|
||||
m_handlerWebSocket = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
|
||||
DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler successful.";
|
||||
DEBUG_LOG() << "Reset WebSocketInterfaceHandler successful.";
|
||||
|
||||
if (!m_handlerWebSocket->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
return false;
|
||||
}
|
||||
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
|
||||
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";
|
||||
DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler successful.";
|
||||
|
||||
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
@@ -174,19 +173,19 @@ ProjectDataManagement::RadioGroup MainHandler::exerciseRadioGroup() const
|
||||
|
||||
bool MainHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Trying to load plugin '" << pi.fullFileName << "'";
|
||||
INFO_LOG() << "Trying to load plugin '" << pi.fullFileName << "'";
|
||||
Plugin::Plugin *tabPlugin = qobject_cast<Plugin::Plugin *>(pi.plugin);
|
||||
if (!tabPlugin)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "failed loading a training area plugin - not a TrainingAreaPlugin object!";
|
||||
WARNING_LOG() << "failed loading a training area plugin - not a TrainingAreaPlugin object!";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "... success";
|
||||
INFO_LOG() << "... success";
|
||||
std::shared_ptr<Plugin::Interface> ifc = tabPlugin->createInterface(this, m_rxHandler, m_txHandler, m_ddsHandler, Settings::settings());
|
||||
|
||||
if (!ifc || !ifc->init())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not initialize training area plugin" << pi.pluginName << pi.fileName;
|
||||
WARNING_LOG() << "Could not initialize training area plugin" << pi.pluginName << pi.fileName;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -242,7 +241,7 @@ TetraIcd::ExerciseEquipmentAssignmentComplete MainHandler::exerciseEquipmentAssi
|
||||
const ProjectDataManagement::RadioGroup rg = radioGroups.value(it.second);
|
||||
if (rg.id() == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got a radio group id " << it.second << " for exercise " << it.first
|
||||
WARNING_LOG() << "Got a radio group id " << it.second << " for exercise " << it.first
|
||||
<< " but could not find valid data for it - ignoring!";
|
||||
continue;
|
||||
}
|
||||
@@ -317,7 +316,7 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState)
|
||||
m_ifcConnectionState.insert(name, connectionState);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Publishing connection states: " << m_ifcConnectionState.size();
|
||||
DEBUG_LOG() << "Publishing connection states: " << m_ifcConnectionState.size();
|
||||
|
||||
TrainingAreaBase::Connections connections;
|
||||
connections.id(1);
|
||||
@@ -330,7 +329,7 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState)
|
||||
|
||||
void MainHandler::onDirectMessage(const QByteArray &jsonMessage)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got direct message " << jsonMessage;
|
||||
DEBUG_LOG() << "Got direct message " << jsonMessage;
|
||||
WebSocketInterface::Messages::BiteDataMessage::BiteData biteData;
|
||||
|
||||
QJsonObject obj = QJsonDocument::fromJson(jsonMessage).object();
|
||||
|
||||
Reference in new issue
Block a user