lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
+19 -20
View File
@@ -33,7 +33,6 @@ HandlerOperatingCondition::HandlerOperatingCondition(MainHandler *mainHandler,
, m_isOperational(false)
, m_oldErrorState(false)
, m_operationalStatusTimer(new QTimer)
, m_logger(getLogger("HandlerOperatingCondition"))
{}
//=============================================================================
HandlerOperatingCondition::~HandlerOperatingCondition()
@@ -77,7 +76,7 @@ void HandlerOperatingCondition::onVehicleBattery(double battery)
{
m_operatingCondition.batteryVoltage(battery);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data Battery to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data Battery to dds";
}
void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRidges &fireStatus)
@@ -117,7 +116,7 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e_def::Smoking);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
}
void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges &fireStatus)
@@ -135,7 +134,7 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data to dds";
}
void HandlerOperatingCondition::onVehicleFireUnits(const CardRidges &fireStatus)
@@ -145,7 +144,7 @@ void HandlerOperatingCondition::onVehicleFireUnits(const CardRidges &fireStatu
m_operatingCondition.firingUnitReadyAftRh(fireStatus.cardrige3);
m_operatingCondition.firingUnitReadyAftLh(fireStatus.cardrige4);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (fireStatus) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (fireStatus) to dds";
}
void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStatus)
@@ -156,7 +155,7 @@ void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStat
m_operatingCondition.errorEquipment(errorStatus.cardrige4);
m_operatingCondition.errorGeneral(errorStatus.cardrige5);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (errorStatus) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (errorStatus) to dds";
if (isErrorDmf() != m_oldErrorState)
{
@@ -169,7 +168,7 @@ void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStat
void HandlerOperatingCondition::onOperationalStatusTimeout()
{
DEBUG_LOG(m_logger) << "Operational status timeout. Setting operational status to: not operational.";
DEBUG_LOG() << "Operational status timeout. Setting operational status to: not operational.";
m_isOperational = false;
m_operatingCondition.readiness(m_isOperational);
@@ -189,7 +188,7 @@ bool HandlerOperatingCondition::isErrorDmf()
void HandlerOperatingCondition::onConnectionToSerial()
{
DEBUG_LOG(m_logger) << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine();
DEBUG_LOG() << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine();
m_mainHandler->handlerVehicle()->setAmmunitionParameter(m_operatingCondition.ammunitionMagazine());
}
@@ -197,7 +196,7 @@ void HandlerOperatingCondition::onVehicleType(const EffectShowManagement::Featur
{
m_operatingCondition.vehicleFeature(type);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (vehicle type) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (vehicle type) to dds";
}
void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
@@ -207,20 +206,20 @@ void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
m_operatingCondition.emergencyStop(status.emergencyStop);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (SafetyStatus) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (SafetyStatus) to dds";
}
void HandlerOperatingCondition::onVehicleRoundCount(int loadedRounds)
{
DEBUG_LOG(m_logger) << "Got RoundCount Reply from Unit " << loadedRounds;
DEBUG_LOG() << "Got RoundCount Reply from Unit " << loadedRounds;
m_operatingCondition.ammunitionMagazine(loadedRounds);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (ammunition magazine) to dds";
}
void HandlerOperatingCondition::onVolleyRounds(int usedRounds)
{
DEBUG_LOG(m_logger) << "Got used rounds " << usedRounds;
DEBUG_LOG() << "Got used rounds " << usedRounds;
m_operatingCondition.ammunitionMagazine(m_operatingCondition.ammunitionMagazine() - usedRounds);
if (m_operatingCondition.ammunitionMagazine() < 0)
m_operatingCondition.ammunitionMagazine(0);
@@ -228,7 +227,7 @@ void HandlerOperatingCondition::onVolleyRounds(int usedRounds)
if (m_operatingCondition.ammunitionAvailable() < 0)
m_operatingCondition.ammunitionAvailable(0);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine used) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data (ammunition magazine used) to dds";
}
void HandlerOperatingCondition::sendStatus()
@@ -253,7 +252,7 @@ void HandlerOperatingCondition::getVehicleStatus(ConvertToTab::VehicleStatus_t &
void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleIdentity &cookie,
const SendAmmunitionRequest &request)
{
DEBUG_LOG(m_logger) << "onSendAmmunitionRequest";
DEBUG_LOG() << "onSendAmmunitionRequest";
//take available ammo and send excon
//then wait for reply from unit
m_operatingCondition.ammunitionAvailable(request.ammunitionAvailable());
@@ -277,7 +276,7 @@ void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleI
void HandlerOperatingCondition::onSendSafetyRevokeRequest(const rti::core::SampleIdentity &cookie,
const SendSafetyRevokeRequest &request)
{
DEBUG_LOG(m_logger) << "onSendSafetyRevokeRequest with " << request.revoke();
DEBUG_LOG() << "onSendSafetyRevokeRequest with " << request.revoke();
m_mainHandler->dds()->fts()->sendSafetyRevokeReply(cookie, Core::FunctionReplyObject());
if (request.revoke())
{
@@ -290,7 +289,7 @@ void HandlerOperatingCondition::onSendSafetyRevokeRequest(const rti::core::Sampl
void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleIdentity &cookie,
const SendReadinessRequest &request)
{
DEBUG_LOG(m_logger) << "onSendReadinessRequest";
DEBUG_LOG() << "onSendReadinessRequest";
//Confirm or Revoke Readiness
//send to EXCON
m_isOperational = request.readiness();
@@ -305,16 +304,16 @@ void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleId
//now change operating condition in hope that tetra worked
m_operatingCondition.readiness(m_isOperational);
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data readiness) to dds";
ERROR_LOG() << "Error publishing OperatingConditionEntity-data readiness) to dds";
if (m_isOperational)
{
DEBUG_LOG(m_logger) << "Operating condition: operational. Starting timer.";
DEBUG_LOG() << "Operating condition: operational. Starting timer.";
m_operationalStatusTimer->start(15 * 60 * 1000);
}
else
{
DEBUG_LOG(m_logger) << "Operating condition: not operational. Stopping timer.";
DEBUG_LOG() << "Operating condition: not operational. Stopping timer.";
m_operationalStatusTimer->stop();
}
}