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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -26,31 +26,31 @@ EffectorStateMachine::~EffectorStateMachine() { stopAllTimer(); }
int EffectorStateMachine::intervalFire()
{
DEBUG_LOG(m_logger) << "intervalFire";
DEBUG_LOG() << "intervalFire";
return QRandomGenerator::global()->bounded(Settings::getEffectorIntervalFireMin(), Settings::getEffectorIntervalFireMax() + 1);
}
int EffectorStateMachine::intervalReportFired()
{
DEBUG_LOG(m_logger) << "intervalReportFired";
DEBUG_LOG() << "intervalReportFired";
return QRandomGenerator::global()->bounded(Settings::getEffectorIntervalReportFiredMin(), Settings::getEffectorIntervalReportFiredMax() + 1);
}
int EffectorStateMachine::intervalReportFireReadiness()
{
DEBUG_LOG(m_logger) << "intervalReportFireReadiness";
DEBUG_LOG() << "intervalReportFireReadiness";
return QRandomGenerator::global()->bounded(m_intervalReportFireReadinessMin, m_intervalReportFireReadinessMax + 1);
}
int EffectorStateMachine::intervalInitialFireReadiness()
{
DEBUG_LOG(m_logger) << "intervalInitialFireReadiness";
DEBUG_LOG() << "intervalInitialFireReadiness";
return QRandomGenerator::global()->bounded(Settings::getEffectorInitialReportFireReadinessMin(), Settings::getEffectorInitialReportFireReadinessMax() + 1);
}
void EffectorStateMachine::init()
{
DEBUG_LOG(m_logger) << "EffectorStateMachine::init";
DEBUG_LOG() << "EffectorStateMachine::init";
emit logMessage(
QStringLiteral("intervalFire min=%1 max=%2, intervalReportFired min=%3 max=%4, intervalReportFireReadiness min=%5 max=%6 , initialFireReadiness min=%7 max=%8")
.arg(
@@ -109,7 +109,7 @@ QString EffectorStateMachine::getStateStr(AreaEffectSimulation::AesEffectorState
bool EffectorStateMachine::overrideReportFireReadinessMinMax(int newMin, int newMax)
{
DEBUG_LOG(m_logger) << "Override ReadinessMinMax min: " << newMin << " max: " << newMax;
DEBUG_LOG() << "Override ReadinessMinMax min: " << newMin << " max: " << newMax;
m_intervalReportFireReadinessMin = newMin;
m_intervalReportFireReadinessMax = newMax;
@@ -118,7 +118,7 @@ bool EffectorStateMachine::overrideReportFireReadinessMinMax(int newMin, int new
bool EffectorStateMachine::resetReportFireReadinessMinMax()
{
DEBUG_LOG(m_logger) << "Reset ReadinessMinMax min:" << Settings::getEffectorIntervalReportFireReadinessMin()
DEBUG_LOG() << "Reset ReadinessMinMax min:" << Settings::getEffectorIntervalReportFireReadinessMin()
<< " max: " << Settings::getEffectorIntervalReportFireReadinessMax();
m_intervalReportFireReadinessMin = Settings::getEffectorIntervalReportFireReadinessMin();
@@ -156,7 +156,7 @@ bool EffectorStateMachine::reportNotFireReadiness()
}
QString timestamp = QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss"));
emit logMessage(QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr));
DEBUG_LOG(m_logger) << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
DEBUG_LOG() << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
emit signalNotReadyToFire();
return true;
}
@@ -199,7 +199,7 @@ bool EffectorStateMachine::reportFireReadiness()
bool EffectorStateMachine::fireOrder()
{
DEBUG_LOG(m_logger) << "fireOrder";
DEBUG_LOG() << "fireOrder";
AreaEffectSimulation::AesEffectorState newState = AreaEffectSimulation::AesEffectorState::EsReceivedOrder;
@@ -209,7 +209,7 @@ bool EffectorStateMachine::fireOrder()
if (m_currentState == newState)
{
emit logMessage(QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr));
DEBUG_LOG(m_logger) << QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr);
DEBUG_LOG() << QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr);
return false;
}
@@ -220,7 +220,7 @@ bool EffectorStateMachine::fireOrder()
if (Settings::getEffectorIntervalFireMin() >= 0)
{
emit logMessage(QStringLiteral("m_timerFire.start()"));
DEBUG_LOG(m_logger) << QStringLiteral("m_timerFire.start()");
DEBUG_LOG() << QStringLiteral("m_timerFire.start()");
m_timerFire.setInterval(intervalFire());
m_timerFire.start();
}
@@ -228,12 +228,12 @@ bool EffectorStateMachine::fireOrder()
else
{
emit logMessage(QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr));
DEBUG_LOG(m_logger) << QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr);
DEBUG_LOG() << QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr);
return false;
}
QString timestamp = QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss"));
emit logMessage(QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr));
DEBUG_LOG(m_logger) << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
DEBUG_LOG() << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
emit signalReceivedOrder();
return true;
}