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
+20
-21
@@ -31,14 +31,13 @@ HandlerTabData::HandlerTabData(Initialization *mainHandler,
|
||||
|
||||
: QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerTabData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
|
||||
//=============================================================================
|
||||
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);
|
||||
@@ -54,13 +53,13 @@ bool HandlerTabData::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "End HandlerTabData";
|
||||
DEBUG_LOG() << "End HandlerTabData";
|
||||
return true;
|
||||
} // end of init()
|
||||
//=============================================================================
|
||||
void HandlerTabData::effectShowVehicleStatusRequest(int equipmentNumber, int participantId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Status Request " << equipmentNumber << ' ' << participantId;
|
||||
DEBUG_LOG() << "Trigger Status Request " << equipmentNumber << ' ' << participantId;
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.equipmentNumber(equipmentNumber);
|
||||
@@ -72,7 +71,7 @@ void HandlerTabData::effectShowVehicleStatusRequest(int equipmentNumber, int par
|
||||
//=============================================================================
|
||||
void HandlerTabData::relocationOrder(int equipmentNumber, int participantId, const ConvertToTab::RelocationOrder_t &relocationOrder)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Relocation Order " << equipmentNumber << ' ' << participantId;
|
||||
DEBUG_LOG() << "Trigger Relocation Order " << equipmentNumber << ' ' << participantId;
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.equipmentNumber(equipmentNumber);
|
||||
@@ -91,7 +90,7 @@ void HandlerTabData::effectShowOrder(int equipmentNumber, int participantId, con
|
||||
|
||||
Core::GeoPosition2D posCenter = effectShowOrder.centerPosition;
|
||||
Core::GeoPosition2D posLl = effectShowOrder.lowerLeftPosition;
|
||||
DEBUG_LOG(m_logger) << "Trigger Effect Show Order " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG() << "Trigger Effect Show Order " << equipmentNumber << ' ' << participantId
|
||||
<< "\n idEffectShow " << effectShowOrder.idEffectShow
|
||||
<< "\n startTime " << effectShowOrder.startTime
|
||||
<< "\n centerPosition " << LtsCoordTrans::mgrsFromGeographic(posCenter.lon(), posCenter.lat())
|
||||
@@ -111,7 +110,7 @@ void HandlerTabData::effectShowOrder(int equipmentNumber, int participantId, con
|
||||
//=============================================================================
|
||||
void HandlerTabData::effectShowStop(int equipmentNumber, int participantId, const qint16 &idEffectShow)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Effect Show Stop " << equipmentNumber << ' ' << participantId;
|
||||
DEBUG_LOG() << "Trigger Effect Show Stop " << equipmentNumber << ' ' << participantId;
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.equipmentNumber(equipmentNumber);
|
||||
@@ -128,7 +127,7 @@ void HandlerTabData::effectShowContinue(int equipmentNumber, int participantId,
|
||||
out.participantId(participantId);
|
||||
out.payload(ConvertToTab::convertEffectShowContinue(effectShowContinue));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Trigger Effect Show Continue " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG() << "Trigger Effect Show Continue " << equipmentNumber << ' ' << participantId
|
||||
<< "\n idEffectShow " << effectShowContinue.idEffectShow
|
||||
<< "\n executionTime " << effectShowContinue.executionTime
|
||||
<< "\n payload" << plText(out.payload());
|
||||
@@ -144,7 +143,7 @@ void HandlerTabData::retractOrder(int equipmentNumber, int participantId, const
|
||||
out.participantId(participantId);
|
||||
out.payload(ConvertToTab::convertOrderRetract(retractOrder));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Trigger Retract Order " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG() << "Trigger Retract Order " << equipmentNumber << ' ' << participantId
|
||||
<< "\n orderType " << retractOrder.orderType
|
||||
<< "\n id " << retractOrder.id
|
||||
<< "\n payload" << plText(out.payload());
|
||||
@@ -159,7 +158,7 @@ void HandlerTabData::meteoData(int equipmentNumber, int participantId, const Met
|
||||
out.participantId(participantId);
|
||||
out.payload(ConvertToTab::convertMeteoData(meteoData));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Trigger Meteo data " << equipmentNumber << ' ' << participantId
|
||||
DEBUG_LOG() << "Trigger Meteo data " << equipmentNumber << ' ' << participantId
|
||||
<< "\n temperature " << meteoData.temperature()
|
||||
<< "\n humidity " << meteoData.humidity()
|
||||
<< "\n pressure " << meteoData.pressure()
|
||||
@@ -172,9 +171,9 @@ void HandlerTabData::meteoData(int equipmentNumber, int participantId, const Met
|
||||
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!";
|
||||
} // end of onSendFireSmokeMarkerDataReply()
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType)
|
||||
@@ -182,18 +181,18 @@ 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::VehicleStatus:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Vehicle Status";
|
||||
DEBUG_LOG() << "Got Vehicle Status";
|
||||
m_mainHandler->handlerEffectShowVehicleStatus()->vehicleStatusReceived(ConvertFromTab::getVehicleStatus(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::OrderConfirmation:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Order Confirmation ";
|
||||
DEBUG_LOG() << "Got Order Confirmation ";
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -202,12 +201,12 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
const ConvertFromTab::OrderConfirmation_t orderConfirmation = ConvertFromTab::getOrderConfirmation(data);
|
||||
if (orderConfirmation.orderType == ConvertFromTab::OrderType_e::Relocation)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "relocationOrderConfirmationReceived(orderConfirmation)";
|
||||
DEBUG_LOG() << "relocationOrderConfirmationReceived(orderConfirmation)";
|
||||
m_mainHandler->handlerEffectShowActorRelocation()->relocationOrderConfirmationReceived(orderConfirmation);
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived(orderConfirmation)";
|
||||
DEBUG_LOG() << "effectShowOrderConfirmationReceived(orderConfirmation)";
|
||||
m_mainHandler->handlerEffectShow()->effectShowOrderConfirmationReceived(orderConfirmation);
|
||||
}
|
||||
break;
|
||||
@@ -225,14 +224,14 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerTabData::publishVehicleStatus(const EffectShowManagement::EffectShowVehicleStatus &vehicleStatus)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Vehicle Status published esmParticipantId: " << vehicleStatus.esmParticipantId() << ' ' << vehicleStatus.operational();
|
||||
DEBUG_LOG() << "Vehicle Status published esmParticipantId: " << vehicleStatus.esmParticipantId() << ' ' << vehicleStatus.operational();
|
||||
m_mainHandler->dds()->dts()->publish(vehicleStatus);
|
||||
} // end of publishVehicleStatus()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void HandlerTabData::sendAdlerFqFb(const int aesId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Send Adler Feuerbereitschaft";
|
||||
DEBUG_LOG() << "Send Adler Feuerbereitschaft";
|
||||
TrainingAreaBase::AdlerFqFbRequest out;
|
||||
|
||||
out.aesItemId(aesId);
|
||||
@@ -242,10 +241,10 @@ void HandlerTabData::sendAdlerFqFb(const int aesId)
|
||||
void HandlerTabData::onAdlerFqFbReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG(m_logger) << "Adler Feuerbereitschaft could not be send: " << reply.str()
|
||||
ERROR_LOG() << "Adler Feuerbereitschaft could not be send: " << reply.str()
|
||||
<< ", id:" << reply.id();
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "Adler Feuerbereitschaft successfully to TAB!";
|
||||
DEBUG_LOG() << "Adler Feuerbereitschaft successfully to TAB!";
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user