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
@@ -22,7 +22,6 @@ HandlerTabData::HandlerTabData(MainHandler *mainHandler,
|
||||
|
||||
: QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerTabData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//=============================================================================
|
||||
@@ -32,7 +31,7 @@ HandlerTabData::~HandlerTabData()
|
||||
//=============================================================================
|
||||
bool HandlerTabData::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Begin HandlerTabData";
|
||||
DEBUG_LOG() << "Begin HandlerTabData";
|
||||
auto dtcTab = m_mainHandler->dds()->dtcTab();
|
||||
connect(dtcTab.get(), &TrainingAreaBase::Interface::Dtc::fireSmokeMarkerDataChanged,
|
||||
this, &HandlerTabData::onFireSmokeMarkerDataChanged);
|
||||
@@ -48,13 +47,13 @@ bool HandlerTabData::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "End HandlerTabData";
|
||||
DEBUG_LOG() << "End HandlerTabData";
|
||||
return true;
|
||||
} // end of init()
|
||||
//=============================================================================
|
||||
void HandlerTabData::orderConfirmation(const ConvertToTab::OrderConfirmation_t &orderConfirmation)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Sending of Order Confirmation ";
|
||||
DEBUG_LOG() << "Trigger Sending of Order Confirmation ";
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.payload(ConvertToTab::convertOrderConfirmation(orderConfirmation));
|
||||
@@ -64,7 +63,7 @@ void HandlerTabData::orderConfirmation(const ConvertToTab::OrderConfirmation_t &
|
||||
//=============================================================================
|
||||
void HandlerTabData::vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleStatus)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Sending of Vehicle Status ";
|
||||
DEBUG_LOG() << "Trigger Sending of Vehicle Status ";
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.payload(ConvertToTab::convertVehicleStatus(vehicleStatus));
|
||||
@@ -74,9 +73,9 @@ void HandlerTabData::vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleS
|
||||
void HandlerTabData::onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG(m_logger) << "Fire Smoke Marker Data could not be send: " << reply.str();
|
||||
ERROR_LOG() << "Fire Smoke Marker Data could not be send: " << reply.str();
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "Fire Smoke Marker Data send successfully to TAB!";
|
||||
DEBUG_LOG() << "Fire Smoke Marker Data send successfully to TAB!";
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType)
|
||||
@@ -84,43 +83,43 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime();
|
||||
DEBUG_LOG() << "Got Fire Smoke Marker " << data.sampleTime();
|
||||
|
||||
switch (ConvertFromTab::isTelegram(data))
|
||||
{
|
||||
case ConvertFromTab::RxTelegram_e::EffectShowOrder:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Effect Show Order";
|
||||
DEBUG_LOG() << "Got Effect Show Order";
|
||||
m_mainHandler->handlerOrder()->createOrder(ConvertFromTab::convertEffectShowOrder(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::RelocationOrder:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Relocation order ";
|
||||
DEBUG_LOG() << "Got Relocation order ";
|
||||
m_mainHandler->handlerOrder()->createOrder(ConvertFromTab::convertRelocationOrder(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::EffectShowStop:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Effect Show Stop ";
|
||||
DEBUG_LOG() << "Got Effect Show Stop ";
|
||||
emit effectShowStopped(ConvertFromTab::convertEffectShowStop(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::EffectShowContinue:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Effect Show Continue ";
|
||||
DEBUG_LOG() << "Got Effect Show Continue ";
|
||||
emit effectShowContinued(ConvertFromTab::convertEffectShowContinue(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::OrderRetract:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Order Retract ";
|
||||
DEBUG_LOG() << "Got Order Retract ";
|
||||
m_mainHandler->handlerOrder()->removeOrder(ConvertFromTab::convertOrderRetract(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::StatusRequest:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Status Request " ;
|
||||
DEBUG_LOG() << "Got Status Request " ;
|
||||
if (ConvertFromTab::convertStatusRequest(data))
|
||||
{
|
||||
m_mainHandler->handlerOperatingCondition()->sendStatus();
|
||||
@@ -129,9 +128,9 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::MeteoData:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Meteo Data ";
|
||||
DEBUG_LOG() << "Got Meteo Data ";
|
||||
if (!m_mainHandler->dds()->dts()->publish(ConvertFromTab::convertMeteoData(data)))
|
||||
ERROR_LOG(m_logger) << "Error publishing MeteoNearVehicle to dds";
|
||||
ERROR_LOG() << "Error publishing MeteoNearVehicle to dds";
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::unknown:
|
||||
|
||||
Reference in new issue
Block a user