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

@@ -38,7 +38,7 @@ bool HandlerArtillerieSound::init()
if (Settings::cesPlayArtillerieSounds())
{
DEBUG_LOG(m_logger) << "init with Artillerie-Sounds";
DEBUG_LOG() << "init with Artillerie-Sounds";
auto dtcAes = m_ddsHandler->dtcAes();
dtcAes->enableExplosionSingle();
@@ -50,7 +50,7 @@ bool HandlerArtillerieSound::init()
this, &HandlerArtillerieSound::onTechnicalAreaChanged);
}
else
DEBUG_LOG(m_logger) << "init without Artillerie-Sounds";
DEBUG_LOG() << "init without Artillerie-Sounds";
return true;
} // end of init()
//-----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
{
DEBUG_LOG(m_logger) << "Remove SingleExplosion";
DEBUG_LOG() << "Remove SingleExplosion";
m_explosionSingleState.remove(data.id());
return;
}
@@ -77,28 +77,28 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) &&
data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)
{
DEBUG_LOG(m_logger) << "Handle SingleExplosion";
DEBUG_LOG() << "Handle SingleExplosion";
handleExplosion = true;
}
m_explosionSingleState.insert(data.id(), data.effectStateId());
DEBUG_LOG(m_logger) << "Got ExplosionSingle State=" << data.effectStateId()
DEBUG_LOG() << "Got ExplosionSingle State=" << data.effectStateId()
<< " id=" << data.id();
if (handleExplosion)
{
DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated) HandlerArtillerieSound";
DEBUG_LOG() << "Handle ExplosionSingle (EsActivated) HandlerArtillerieSound";
auto assetPositions = m_handlerBuildingData->getAssetPositions();
///////////////////////////////////////////////////////////////////
/// Play Sound to each EGCU and OSGU volume depends on distance
///////////////////////////////////////////////////////////////////
INFO_LOG(m_logger) << "printAssetPositions: ";
INFO_LOG() << "printAssetPositions: ";
QHashIterator<int, CentralEffectSimulation::HandlerBuildingData::AssetPosition> i(assetPositions);
while (i.hasNext())
{
i.next();
INFO_LOG(m_logger) << "printAssetPositions: "
INFO_LOG() << "printAssetPositions: "
<< i.key() << ": " << i.value().structureElementId
<< " type = " << i.value().mountingPointType
<< " hostname =" << i.value().hostname
@@ -113,7 +113,7 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
const qreal distanceThreshold = Settings::cesDistanceThreshold(); // [m]
const qreal factor = Settings::cesFactor();
const qreal cesReduceFactor = Settings::cesReduceFactor();
INFO_LOG(m_logger) << "Distance to Explosion =" << distance
INFO_LOG() << "Distance to Explosion =" << distance
<< " hostname =" << i.value().hostname
<< " distanceThreshold=" << distanceThreshold
<< " factor=" << factor;
@@ -138,13 +138,13 @@ void HandlerArtillerieSound::playSound(QString &user, QString &passwd, const QSt
url.setUrl(request);
url.setUserName(user);
url.setPassword(passwd);
DEBUG_LOG(m_logger) << "startRequest: " << url.toString();
DEBUG_LOG() << "startRequest: " << url.toString();
startRequest(url);
}
void HandlerArtillerieSound::startRequest(const QUrl &requestedUrl)
{
DEBUG_LOG(m_logger) << "startRequest: " << requestedUrl.toString();
DEBUG_LOG() << "startRequest: " << requestedUrl.toString();
m_httpRequestAborted = false;
auto reply = m_qnam.get(QNetworkRequest(requestedUrl));
connect(reply, &QNetworkReply::finished, this, &HandlerArtillerieSound::httpFinished);
@@ -153,14 +153,14 @@ void HandlerArtillerieSound::startRequest(const QUrl &requestedUrl)
void HandlerArtillerieSound::httpFinished()
{
DEBUG_LOG(m_logger) << "httpFinished";
DEBUG_LOG() << "httpFinished";
auto reply = qobject_cast<QNetworkReply *>(sender());
if (!reply)
return;
if (m_httpRequestAborted)
{
ERROR_LOG(m_logger) << "httpRequestAborted";
ERROR_LOG() << "httpRequestAborted";
reply->deleteLater();
return;
}
@@ -169,7 +169,7 @@ void HandlerArtillerieSound::httpFinished()
{
QNetworkRequest request = reply->request();
QUrl url = request.url();
ERROR_LOG(m_logger) << "reply->error: " << reply->errorString()
ERROR_LOG() << "reply->error: " << reply->errorString()
<< " host=" << url.host()
<< " query='" << url.query()
<< "' '" << qUtf8Printable(url.toString()) << "'";
@@ -182,7 +182,7 @@ void HandlerArtillerieSound::httpFinished()
//parse the reply JSON and display result in the UI
const QByteArray json(reply->readAll());
DEBUG_LOG(m_logger) << "Sucess " << json;
DEBUG_LOG() << "Sucess " << json;
reply->deleteLater();
}
@@ -199,7 +199,7 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation::
if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
{
DEBUG_LOG(m_logger) << "Remove TechnicalArea";
DEBUG_LOG() << "Remove TechnicalArea";
m_technicalAreas.remove(data.id());
return;
}
@@ -207,14 +207,14 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation::
{
int zone = -1;
m_technicalAreas.insert(data.id(), data);
DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id();
DEBUG_LOG() << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id();
QPointF cornerButtomLeft = CentralEffectSimulation::geographic2Utm(data.area().cornerBottomLeft(), &zone);
qreal x = cornerButtomLeft.x() + data.area().width() / 2;
qreal y = cornerButtomLeft.y() + data.area().height() / 2;
QPointF center(x, y);
DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound cornerButtomLeft = " << cornerButtomLeft.x() << "/" << cornerButtomLeft.y()
DEBUG_LOG() << "Handle TechnicalArea HandlerArtillerieSound cornerButtomLeft = " << cornerButtomLeft.x() << "/" << cornerButtomLeft.y()
<< " zone=" << zone;
DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound center = " << center.x() << "/" << center.y()
DEBUG_LOG() << "Handle TechnicalArea HandlerArtillerieSound center = " << center.x() << "/" << center.y()
<< " zone=" << zone;
}
} // onTechnicalAreaChanged
@@ -61,7 +61,7 @@ bool CesArtillerySoundInterfaceImpl::init(int domainId, int exerciseId)
{
m_domainId = domainId;
m_exerciseId = exerciseId;
INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init()"
INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::init()"
<< " m_domainId=" << m_domainId
<< " m_exerciseId=" << m_exerciseId;
@@ -74,11 +74,11 @@ bool CesArtillerySoundInterfaceImpl::init(int domainId, int exerciseId)
if (!m_handlerArtillerieSound->init())
{
ERROR_LOG(m_logger) << "Initialisation m_handlerArtillerieSound failed.";
ERROR_LOG() << "Initialisation m_handlerArtillerieSound failed.";
return false;
}
INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init() return true";
INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::init() return true";
return true;
}
@@ -87,10 +87,6 @@ private:
std::shared_ptr<CentralEffectSimulation::HandlerBuildingData> m_handlerBuildingData; ///< Pointer to AES Building handler
std::shared_ptr<CentralEffectSimulation::HandlerParticipant> m_handlerParticipant; ///< Pointer to handler for all participants
std::shared_ptr<HandlerArtillerieSound> m_handlerArtillerieSound; /// < Pointer to handler for Artillerie Sound
NGL::INGLLogger &m_logger;
int m_domainId = 0;
int m_exerciseId = 0;
};