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
+21
-22
@@ -19,7 +19,6 @@ MainHandler::MainHandler()
|
||||
, m_handelEffectsBsm(nullptr)
|
||||
, m_handleHttpRequest(nullptr)
|
||||
, m_bsmFlash(BEO_Auto)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
@@ -60,17 +59,17 @@ bool MainHandler::init(const QString &ammuXml,
|
||||
}
|
||||
if (!m_vwmApi->init(ammuXml, vwmXml, bsmConfig, initBuilding))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize VWM API - aborting";
|
||||
ERROR_LOG() << "Can not initialize VWM API - aborting";
|
||||
return false;
|
||||
}
|
||||
if (!m_jsonApi->init(listenPort))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize Json API - aborting";
|
||||
ERROR_LOG() << "Can not initialize Json API - aborting";
|
||||
return false;
|
||||
}
|
||||
if (!m_bsmApi->init(bsmConfig))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize BSM API - aborting";
|
||||
ERROR_LOG() << "Can not initialize BSM API - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -136,16 +135,16 @@ bool MainHandler::init(const QString &ammuXml,
|
||||
|
||||
void MainHandler::setInitialOverrides(const QString &hostname)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setInitialOverrides m_handelEffectsVec.size()=" << m_handelEffectsVec.size();
|
||||
DEBUG_LOG() << "setInitialOverrides m_handelEffectsVec.size()=" << m_handelEffectsVec.size();
|
||||
|
||||
for ( int i = 0; i < m_handelEffectsVec.size(); i++)
|
||||
{
|
||||
QString hostnameLocal = m_handelEffectsVec.at(i)->hostname();
|
||||
const QVector<BcuEffectState> effectStates = m_handelEffectsVec.at(i)->getOverrides();
|
||||
DEBUG_LOG(m_logger) << "setInitialOverrides host=" << hostnameLocal
|
||||
DEBUG_LOG() << "setInitialOverrides host=" << hostnameLocal
|
||||
<< " effectStates.size=" << effectStates.size();
|
||||
for (int j = 0; j < effectStates.size(); j++)
|
||||
DEBUG_LOG(m_logger) << "setInitialOverrides j=" << j
|
||||
DEBUG_LOG() << "setInitialOverrides j=" << j
|
||||
<< " id=" << effectStates[j].id
|
||||
<< " type=" << effectStates[j].type
|
||||
<< " override=" << effectStates[j].effectOverride;
|
||||
@@ -172,7 +171,7 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
|
||||
{
|
||||
Q_UNUSED(contaminationStates)
|
||||
const VWM::Charge charge = m_vwmApi->chargeFromChargeTypeId(result.chargeTypeId);
|
||||
DEBUG_LOG(m_logger) << "onHitResult chargeTypeId=" << result.chargeTypeId
|
||||
DEBUG_LOG() << "onHitResult chargeTypeId=" << result.chargeTypeId
|
||||
<< " result.effectSoundId=" << result.effectSoundId
|
||||
<< " damagePercentNew=" << result.damagePercentNew
|
||||
<< " destructiveFactor=" << charge.destructiveFactor;
|
||||
@@ -183,15 +182,15 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
|
||||
{
|
||||
for (HandelEffects *he : std::as_const(m_handelEffectsVec))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "playHitSound @EGCU " << he->hostname() << ", SoundId: " << result.effectSoundId;
|
||||
DEBUG_LOG() << "playHitSound @EGCU " << he->hostname() << ", SoundId: " << result.effectSoundId;
|
||||
he->playHitSound(result.effectSoundId);
|
||||
}
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "HitResult: " << result;
|
||||
DEBUG_LOG() << "HitResult: " << result;
|
||||
if (result.sensorId != 0 && result.originatorId != 0 && m_bsmFlash != BEO_Off && charge.destructiveFactor > 1 )
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "BSM Flash";
|
||||
DEBUG_LOG() << "BSM Flash";
|
||||
m_bsmApi->triggerFlashlight(result.sensorId);
|
||||
m_bsmApi->triggerFlashlightPulse(result.sensorId,
|
||||
QString(),
|
||||
@@ -201,7 +200,7 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
|
||||
Settings::flashDuration());
|
||||
}
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "Kein BSM Flash";
|
||||
DEBUG_LOG() << "Kein BSM Flash";
|
||||
|
||||
|
||||
|
||||
@@ -211,14 +210,14 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
|
||||
|
||||
for (int i = 0; i < m_egcuConfig.egcus.size(); i++)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "segmentDamage.size=" << segmentDamage.size();
|
||||
DEBUG_LOG() << "segmentDamage.size=" << segmentDamage.size();
|
||||
if ( i < segmentDamage.size() )
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "segmentDamage[" << i <<"]=" << segmentDamage[i];
|
||||
DEBUG_LOG() << "segmentDamage[" << i <<"]=" << segmentDamage[i];
|
||||
m_handelEffectsVec[i]->startEffects(segmentDamage[i]);
|
||||
}
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "No segment Damage for egcu:" << m_egcuConfig.egcus[i].hostname;
|
||||
DEBUG_LOG() << "No segment Damage for egcu:" << m_egcuConfig.egcus[i].hostname;
|
||||
}
|
||||
m_handelEffectsBsm->startEffects(result.damagePercentNew);
|
||||
}
|
||||
@@ -232,22 +231,22 @@ void MainHandler::onUnknownDirectHit(int sensorId)
|
||||
|
||||
void MainHandler::onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEffectState> &effectStates)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "1 BSM flash hostname='" << hostname
|
||||
DEBUG_LOG() << "1 BSM flash hostname='" << hostname
|
||||
<< "' isEmpty:"<< hostname.isEmpty()
|
||||
<<" isNull:" << hostname.isNull();
|
||||
m_effectStates.insert(hostname, effectStates);
|
||||
if (hostname.isEmpty())
|
||||
{
|
||||
m_bsmFlash = BEO_Auto;
|
||||
DEBUG_LOG(m_logger) << "2 BSM flash =" << m_bsmFlash;
|
||||
DEBUG_LOG() << "2 BSM flash =" << m_bsmFlash;
|
||||
m_handelEffectsBsm->setOverrides(effectStates);
|
||||
for ( int i = 0; i < effectStates.size(); i++)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "3 BSM flash =" << m_bsmFlash;
|
||||
DEBUG_LOG() << "3 BSM flash =" << m_bsmFlash;
|
||||
if ( effectStates.at(i).type == BET_BsmFlash)
|
||||
{
|
||||
m_bsmFlash = effectStates.at(i).effectOverride;
|
||||
DEBUG_LOG(m_logger) << "4 BSM flash =" << m_bsmFlash;
|
||||
DEBUG_LOG() << "4 BSM flash =" << m_bsmFlash;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -267,7 +266,7 @@ void MainHandler::onSwitchRelayRequest(const QString &hostname, const SwitchRela
|
||||
{
|
||||
if (m_handelEffectsVec[i]->hostname() == hostname )
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "switchRelay "
|
||||
DEBUG_LOG() << "switchRelay "
|
||||
<< " id=" << switchRelayValues.id
|
||||
<< " bcuRelayState=" << switchRelayValues.bcuRelayState;
|
||||
m_handelEffectsVec[i]->switchRelay(switchRelayValues);
|
||||
@@ -329,7 +328,7 @@ QVector<int> MainHandler::getSegmentDamage(const QVector<HitRoom> &allHitRooms,
|
||||
if (egcu.roomIds.size() > 0 )
|
||||
averageDamage = damagePercentSegment / egcu.roomIds.size();
|
||||
result.append(averageDamage);
|
||||
INFO_LOG(m_logger) << "getSegmentDamage[" << egcu.hostname << "]=" << averageDamage;
|
||||
INFO_LOG() << "getSegmentDamage[" << egcu.hostname << "]=" << averageDamage;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -338,7 +337,7 @@ QVector<int> MainHandler::getSegmentDamage(const QVector<HitRoom> &allHitRooms,
|
||||
void MainHandler::flashBuildingDestructionIndicator(int egcu)
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << "TODO flashBuildingDestructionIndicator egcu=" << egcu;
|
||||
ERROR_LOG() << "TODO flashBuildingDestructionIndicator egcu=" << egcu;
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user