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/control_unit_handler.cpp
+26 -27
View File
@@ -17,7 +17,6 @@ ControlUnitHandler::ControlUnitHandler(QObject *parent)
, m_connectionHandler(new ConnectionHandler(this))
, m_timer(new QTimer(this))
, m_feature(EffectShowManagement::Feature_e::NotSpecified)
, m_logger(getLogger("ControlUnitHandler"))
{
m_timer->setInterval(10000);
connect(m_timer, &QTimer::timeout, this, &ControlUnitHandler::onConnectedToSerialConveter);
@@ -33,7 +32,7 @@ bool ControlUnitHandler::init()
{
if (!m_connectionHandler->init())
{
DEBUG_LOG(m_logger) << "Could not init ConnectionHandler";
DEBUG_LOG() << "Could not init ConnectionHandler";
return false;
}
@@ -60,7 +59,7 @@ bool ControlUnitHandler::send(const CommandSignal command, const unsigned int ro
commandByte = command + roundCount;
else
{
DEBUG_LOG(m_logger) << "Bad round count for command FT_SE_CB_WERFER_STATUS";
DEBUG_LOG() << "Bad round count for command FT_SE_CB_WERFER_STATUS";
return false;
}
break;
@@ -71,7 +70,7 @@ bool ControlUnitHandler::send(const CommandSignal command, const unsigned int ro
commandByte = command + roundCount;
else
{
DEBUG_LOG(m_logger) << "Bad round count for command FT_SE_CB_WERFER_MUNITION";
DEBUG_LOG() << "Bad round count for command FT_SE_CB_WERFER_MUNITION";
return false;
}
break;
@@ -83,7 +82,7 @@ bool ControlUnitHandler::send(const CommandSignal command, const unsigned int ro
}
}
DEBUG_LOG(m_logger) << "Sending int/byte to connectionHandler: " << commandByte << QString::number(commandByte, 2); // todorm
DEBUG_LOG() << "Sending int/byte to connectionHandler: " << commandByte << QString::number(commandByte, 2); // todorm
// emit sending(QString(QStringLiteral("%1 - %2")).arg(QString::number(commandByte, 2).rightJustified(8, QLatin1Char('0'))).arg(commandByte));
QByteArray data;
@@ -98,24 +97,24 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
{
if (ba.size() >= 1)
{
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(0) " << (ba.at(0));
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(0) & 0xFF " << (ba.at(0) & 0xFF);
TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(0) " << (ba.at(0));
TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(0) & 0xFF " << (ba.at(0) & 0xFF);
}
else
{
DEBUG_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba is empty";
DEBUG_LOG() << "ControlUnitHandler::onDataReceived ba is empty";
return;
}
if (ba.size() >= 2)
{
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(1) " << (ba.at(1));
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(1) & 0xFF " << (ba.at(1) & 0xFF);
TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(1) " << (ba.at(1));
TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(1) & 0xFF " << (ba.at(1) & 0xFF);
}
const unsigned int data = ba.at(0);
if (data >= SE_FT_CB_WERFER_MUNITION && data < 93)
{
DEBUG_LOG(m_logger) << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION: " << data;
DEBUG_LOG(m_logger) << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION real: " << data - SE_FT_CB_WERFER_MUNITION;
DEBUG_LOG() << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION: " << data;
DEBUG_LOG() << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION real: " << data - SE_FT_CB_WERFER_MUNITION;
emit vehicleRoundCount(data - SE_FT_CB_WERFER_MUNITION);
return;
}
@@ -133,14 +132,14 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
* our defined ReturningSignals enum.
*/
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba " << ba;
TRACE_LOG() << "ControlUnitHandler::onDataReceived ba " << ba;
const unsigned int commandByte = ba.at(0) & 0xFF;
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived byte " << commandByte;
TRACE_LOG() << "ControlUnitHandler::onDataReceived byte " << commandByte;
const unsigned int byte = ba.at(1) & 0xFF;
TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived cmdbyte" << byte;
TRACE_LOG() << "ControlUnitHandler::onDataReceived cmdbyte" << byte;
TRACE_LOG(m_logger) << "onDataReceived byte: " << byte << " commandByte: " << commandByte;
TRACE_LOG() << "onDataReceived byte: " << byte << " commandByte: " << commandByte;
switch (commandByte)
{
@@ -162,7 +161,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
emit safetyStatus(SafetyConfirmation_e::SafetyExpiring);
else
emit safetyStatus(SafetyConfirmation_e::SafetyNotConfirmed);
DEBUG_LOG(m_logger) << "safety warning ";
DEBUG_LOG() << "safety warning ";
emit safetyWarnings(sst);
break;
}
@@ -177,7 +176,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
else
m_feature = EffectShowManagement::Feature_e::NotSpecified;
DEBUG_LOG(m_logger) << "Got Vehicle Type " << m_feature;
DEBUG_LOG() << "Got Vehicle Type " << m_feature;
emit vehicleType(m_feature);
break;
}
@@ -189,7 +188,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
scr.cardrige3 = byte & BIT_POSITION_5;
scr.cardrige4 = byte & BIT_POSITION_4;
scr.cardrige5 = byte & BIT_POSITION_3;
DEBUG_LOG(m_logger) << " CB STATUS FEUER " << byte;
DEBUG_LOG() << " CB STATUS FEUER " << byte;
emit vehicleErrorStatus(scr);
break;
}
@@ -207,7 +206,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
scr.cardrige4 = byte & BIT_POSITION_4;
scr.cardrige5 = byte & BIT_POSITION_3;
//emit vehicleSmokeCardridgesStatus(scr);
DEBUG_LOG(m_logger) << " WERFER STATUS ";
DEBUG_LOG() << " WERFER STATUS ";
emit vehicleFireUnits(scr);
break;
}
@@ -219,7 +218,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
scr.cardrige3 = byte & BIT_POSITION_5;
scr.cardrige4 = byte & BIT_POSITION_4;
scr.cardrige5 = byte & BIT_POSITION_3;
DEBUG_LOG(m_logger) << " NB STATUS ";
DEBUG_LOG() << " NB STATUS ";
emit vehicleSmokeCardridgesStatus(scr);
break;
}
@@ -241,13 +240,13 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
}
case ReturningSignal::SE_FT_CB_SALVE_ERLEDIGT:
{
DEBUG_LOG(m_logger) << "Volley Done";
DEBUG_LOG() << "Volley Done";
emit vehicleFinshedVolley(byte);
break;
}
case ReturningSignal::SE_FT_CB_SALVE_UNTERBROCHEN:
{
DEBUG_LOG(m_logger) << "Volley Stopped!!";
DEBUG_LOG() << "Volley Stopped!!";
emit vehicleStoppedVolley(byte);
//add error to ui
CardRidges scr;
@@ -257,22 +256,22 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
}
case ReturningSignal::SE_FT_CB_SICHERHEIT_WIDERRUFEN:
{
DEBUG_LOG(m_logger) << "Sicherheit widerrufen!!";
DEBUG_LOG() << "Sicherheit widerrufen!!";
emit vehicleSafetyRevoked();
break;
}
default:
{
DEBUG_LOG(m_logger) << "onDataReceived switch default";
DEBUG_LOG() << "onDataReceived switch default";
break;
}
}
TRACE_LOG(m_logger) << "end of onDataReceived";
TRACE_LOG() << "end of onDataReceived";
}
void ControlUnitHandler::onConnectedToSerialConveter()
{
DEBUG_LOG(m_logger) << "Send Type Request";
DEBUG_LOG() << "Send Type Request";
send(CommandSignal::FT_SE_CB_FZRSTYP);
}