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/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp
+46 -48
View File
@@ -20,7 +20,6 @@ namespace TrainingAreaBase
AesStateHandler::AesStateHandler(MainHandler *mainHandler)
: m_dbInterface(mainHandler->dbHandler()->db())
, m_exerciseId(mainHandler->exerciseId())
, m_logger(getLogger("AesStateHandler"))
{}
@@ -31,7 +30,7 @@ void RecvFromDdsAes::txData(const TrainingAreaBase::TetraIcd::DusMineReactivatio
m_sentAesTelegrams.push_back(new TrainingAreaBase::TetraIcd::DusMineReactivation(tele));
m_sentAesTelegramsAesIds.push_back(-1);
m_checkOutdatedTelegramsTimer->start();
DEBUG_LOG(m_logger) << "Appending " << tele.type() << " to m_sentAesTelegrams";
DEBUG_LOG() << "Appending " << tele.type() << " to m_sentAesTelegrams";
}
bool AesStateHandler::init()
@@ -42,14 +41,14 @@ bool AesStateHandler::init()
m_tetraId2ddsId[item.aesTetraId] = item.aesDdsId;
m_ddsId2TetraId[item.aesDdsId] = item.aesTetraId;
DEBUG_LOG(m_logger) << "AES internal DDS id: " << item.aesDdsId << " - tetra id: " << item.aesTetraId;
DEBUG_LOG() << "AES internal DDS id: " << item.aesDdsId << " - tetra id: " << item.aesTetraId;
if (item.isAvailableInTetra)
m_aesInTetraAvailable += item.aesTetraId;
};
if (!m_dbInterface->selectByExerciseId(cb, m_exerciseId))
{
ERROR_LOG(m_logger) << "Error retrieving data from database!";
ERROR_LOG() << "Error retrieving data from database!";
return false;
}
@@ -73,7 +72,7 @@ int AesStateHandler::createAesTetraId(int aesDdsId, bool &alreadyExists)
aes2Ta.exerciseId = m_exerciseId;
if (!m_dbInterface->insert(aes2Ta))
{
WARNING_LOG(m_logger) << "Unable to create a valid area effect simulation id for tetra!";
WARNING_LOG() << "Unable to create a valid area effect simulation id for tetra!";
return -1;
}
@@ -95,7 +94,7 @@ bool AesStateHandler::update(int aesDdsId, int aesTetraId, bool bSentToTetra)
aes2Ta.exerciseId = m_exerciseId;
if (!m_dbInterface->update(aes2Ta))
{
WARNING_LOG(m_logger) << "Unable to update area effect simulation id for tetra in database!";
WARNING_LOG() << "Unable to update area effect simulation id for tetra in database!";
return false;
}
@@ -121,7 +120,6 @@ RecvFromDdsAes::RecvFromDdsAes(MainHandler *mainHandler,
, m_mainHandler(mainHandler)
, m_checkOutdatedTelegramsTimer(new QTimer(this))
, m_sendDusMineReactivtionTimer(new QTimer(this))
, m_logger(getLogger("RecvFromDdsAes"))
{
m_checkOutdatedTelegramsTimer->setSingleShot(true);
m_checkOutdatedTelegramsTimer->setInterval(5000);
@@ -205,7 +203,7 @@ bool RecvFromDdsAes::init()
return false;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::init() successful";
DEBUG_LOG() << "RecvFromDdsAes::init() successful";
return true;
}
@@ -362,7 +360,7 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request)
if (!bAlreadyExists)
{
WARNING_LOG(m_logger) << "Trying to send a SMArt single fire to training area but it was not created until now... !?";
WARNING_LOG() << "Trying to send a SMArt single fire to training area but it was not created until now... !?";
bool bOnlyNameChanged;
dataChanged(data, bOnlyNameChanged);
}
@@ -378,7 +376,7 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request)
template <typename T>
void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modType, TetraIcd::AreaEffectSimulationType aesType)
{
DEBUG_LOG(m_logger) << "RecvFromDdsAes::handleEffectSimulation(id=" << data.id()
DEBUG_LOG() << "RecvFromDdsAes::handleEffectSimulation(id=" << data.id()
<< ", modType: " << static_cast<int>(modType)
<< ", type=" << static_cast<int>(aesType)
<< ", name: " << data.name()
@@ -392,7 +390,7 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT
{
if (m_mainHandler->pdmHandler()->isSmartChargeType(data.chargeStruct()))
{
DEBUG_LOG(m_logger) << "Do not send SMART Single/AreaFire to Tetra as broadcast, hits are send directly.";
DEBUG_LOG() << "Do not send SMART Single/AreaFire to Tetra as broadcast, hits are send directly.";
return;
}
}
@@ -579,7 +577,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
const auto &mineArea = it->second;
if (mineArea.isDus() || mineArea.isConcrete())
{
INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId() << " - is a DUS mineArea";
INFO_LOG() << "Not publishing mineArea single state for " << data.aesItemId() << " - is a DUS mineArea";
return;
}
@@ -590,7 +588,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
case AreaEffectSimulation::AesEffectState::EsRemoved:
case AreaEffectSimulation::AesEffectState::EsUnknown:
{
INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId() << " - with state " << AreaEffectSimulation::toString(mineArea.effectStateId());
INFO_LOG() << "Not publishing mineArea single state for " << data.aesItemId() << " - with state " << AreaEffectSimulation::toString(mineArea.effectStateId());
return;
}
default:
@@ -599,7 +597,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
}
else
{
INFO_LOG(m_logger) << "Storing mineArea single state, as we dont have the corresponding mineArea yet aesId" << data.aesItemId();
INFO_LOG() << "Storing mineArea single state, as we dont have the corresponding mineArea yet aesId" << data.aesItemId();
m_temporarySingleMineState[data.aesItemId()] = data;
return;
}
@@ -649,7 +647,7 @@ void RecvFromDdsAes::onDusMineStateChanged(const AreaEffectSimulation::DusMineSt
if (!m_minesToSend.isEmpty())
m_sendDusMineReactivtionTimer->start();
else
INFO_LOG(m_logger) << "Nothing changed in DusMineState of MineArea: " << data.id();
INFO_LOG() << "Nothing changed in DusMineState of MineArea: " << data.id();
}
void RecvFromDdsAes::onSendDusMineReactivationTimeout()
@@ -662,7 +660,7 @@ void RecvFromDdsAes::onSendDusMineReactivationTimeout()
out.dusSerialNumbers.push_back(mineId);
}
m_minesToSend.clear();
INFO_LOG(m_logger) << "Reactivating " << out.dusSerialNumbers.size() << " mines";
INFO_LOG() << "Reactivating " << out.dusSerialNumbers.size() << " mines";
txData(out);
}
@@ -750,7 +748,7 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data,
const int aesTetraId = m_aesStateHandler->createAesTetraId(aesItemId, bAlreadyExists);
DEBUG_LOG(m_logger) << "RecvFromDdsAes::onEffectsChanged(Effects, "
DEBUG_LOG() << "RecvFromDdsAes::onEffectsChanged(Effects, "
<< aesTetraId << ")";
TetraIcd::CreateAreaExplosion cAes;
@@ -803,7 +801,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::AirS
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(AirSupportImpact, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(AirSupportImpact, "
<< aesTetraId << ")";
TetraIcd::CreateSingleExplosion cAes;
@@ -831,7 +829,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::BCCo
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::CContamination, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(BCContamination, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(BCContamination, "
<< aesTetraId << ")";
TetraIcd::CreateCContamination cAes;
cAes.expansionFactor = pdm()->dtc()->expansionFactor(aes.chargeStruct().chargeTypeId(),
@@ -878,7 +876,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
<< aesTetraId << ")";
TetraIcd::CreateAreaExplosion cAes;
@@ -906,7 +904,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct());
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation "
<< ", aes " << aes
<< ", bIsLaserGuidable " << bIsLaserGuidable;
@@ -922,7 +920,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
<< aesTetraId << ")";
TetraIcd::CreateAreaExplosion cAes;
@@ -971,7 +969,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionSingle, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionSingle, "
<< aesTetraId << ")";
TetraIcd::CreateSingleExplosion cAes;
@@ -997,7 +995,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::MineArea, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(MineArea, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(MineArea, "
<< aesTetraId << ")";
TetraIcd::CreateMineArea cAes;
@@ -1027,20 +1025,20 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine
const QPointF relStart = m_posHandler->geographicToRelativePointF(s.positionStart());
const QPointF relEnd = m_posHandler->geographicToRelativePointF(s.positionEnd());
const QLineF line({relStart.x(), relStart.y()}, {relEnd.x(), relEnd.y()});
DEBUG_LOG(m_logger) << "relStart: x: " << relStart.x() << ", y: " << relStart.y();
DEBUG_LOG(m_logger) << "relEnd: x: " << relEnd.x() << ", y: " << relEnd.y();
DEBUG_LOG() << "relStart: x: " << relStart.x() << ", y: " << relStart.y();
DEBUG_LOG() << "relEnd: x: " << relEnd.x() << ", y: " << relEnd.y();
QTransform trans;
trans.rotate(0-line.angle());
const QPointF ofs = trans.map(QPointF(aes.width() / 2, 0));
DEBUG_LOG(m_logger) << "ofs: x: " << ofs.x() << ", y: " << ofs.y();
DEBUG_LOG() << "ofs: x: " << ofs.x() << ", y: " << ofs.y();
segment.relStart.offsetX = qRound(relStart.x() + ofs.y());
segment.relStart.offsetY = qRound(relStart.y() - ofs.x());
segment.relEnd.offsetX = qRound(relEnd.x() + ofs.y());
segment.relEnd.offsetY = qRound(relEnd.y() - ofs.x());
DEBUG_LOG(m_logger) << "start offset: x: " << segment.relStart.offsetX << ", y: " << segment.relStart.offsetY;
DEBUG_LOG(m_logger) << "end offset: x: " << segment.relEnd.offsetX << ", y: " << segment.relEnd.offsetY;
DEBUG_LOG() << "start offset: x: " << segment.relStart.offsetX << ", y: " << segment.relStart.offsetY;
DEBUG_LOG() << "end offset: x: " << segment.relEnd.offsetX << ", y: " << segment.relEnd.offsetY;
}
cAes.segments.push_back(segment);
}
@@ -1058,7 +1056,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::NCon
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::NContamination, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(NContamination, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(NContamination, "
<< aesTetraId << ")";
TetraIcd::CreateNContamination cAes;
@@ -1082,7 +1080,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Func
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::FunctionalArea, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(FunctionalArea, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(FunctionalArea, "
<< aesTetraId << ")";
TetraIcd::CreateFunctionalArea fAes;
@@ -1108,7 +1106,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Tech
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(TechnicalArea, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(TechnicalArea, "
<< aesTetraId << ")";
TetraIcd::TechnicalArea fAes;
@@ -1130,7 +1128,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::DusS
sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::DusSingleMineSimulator, aes.id());
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(DusSingleMine, "
DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(DusSingleMine, "
<< aesTetraId << ")";
TetraIcd::CreateDusSingleMine dAes;
@@ -1159,10 +1157,10 @@ void RecvFromDdsAes::sendModifyEffectSimulationName(TetraIcd::AreaEffectSimulati
if (aesTetraId == 0)
{
WARNING_LOG(m_logger) << "Trying to modify an effect simulation name but have no aes identification: " << name;
WARNING_LOG() << "Trying to modify an effect simulation name but have no aes identification: " << name;
return;
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendModifyEffectSimulationName(" << static_cast<int>(aesType)
DEBUG_LOG() << "RecvFromDdsAes::sendModifyEffectSimulationName(" << static_cast<int>(aesType)
<< ", " << aesTetraId << ", " << name << ")";
TetraIcd::ModifyAreaEffectSimulationName mAes;
@@ -1186,16 +1184,16 @@ void RecvFromDdsAes::sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationTy
const int aesTetraId = m_aesStateHandler->getAesTetraId(aesDdsId);
if (aesTetraId == 0)
{
DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId;
DEBUG_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId;
return;
}
if (!m_aesStateHandler->update(aesDdsId, aesTetraId, false))
{
WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
<< ", " << aesTetraId << ")";
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendRemoveEffectSimulation(id=" << aesDdsId
DEBUG_LOG() << "RecvFromDdsAes::sendRemoveEffectSimulation(id=" << aesDdsId
<< ", type=" << static_cast<int>(aesType)
<< ", tetraId=" << aesTetraId << ")";
@@ -1224,15 +1222,15 @@ void RecvFromDdsAes::sendPauseEffectSimulation(int aesDdsId)
const int aesTetraId = m_aesStateHandler->getAesTetraId(aesDdsId);
if (aesTetraId == 0)
{
DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
DEBUG_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
return;
}
if (!m_aesStateHandler->update(aesDdsId, aesTetraId, true))
{
WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
<< ", " << aesTetraId << ")";
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
DEBUG_LOG() << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
<< ", tetraId=" << aesTetraId << ")";
TetraIcd::PauseEffectSimulation dAes;
@@ -1256,15 +1254,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id());
if (aesTetraId == 0)
{
DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
DEBUG_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
return;
}
if (!m_aesStateHandler->update(aesDdsId, aesTetraId, true))
{
WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
<< ", " << aesTetraId << ")";
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
DEBUG_LOG() << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
<< ", tetraId=" << aesTetraId << ")";
TetraIcd::ResumeEffectSimulation dAes;
@@ -1296,15 +1294,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id());
if (aesTetraId == 0)
{
WARNING_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
WARNING_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
return;
}
if (!m_aesStateHandler->update(aesDdsId, aesTetraId, true))
{
WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
<< ", " << aesTetraId << ")";
}
DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
DEBUG_LOG() << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
<< ", tetraId=" << aesTetraId << ")";
TetraIcd::ResumeEffectSimulation dAes;
@@ -1342,7 +1340,7 @@ void RecvFromDdsAes::onCheckOutdatedTelegrams()
}
if (!deactivatedAesIds.contains(aesId))
continue;
INFO_LOG(m_logger) << "Removing tele " << tele->type() << " from aes tele stack";
INFO_LOG() << "Removing tele " << tele->type() << " from aes tele stack";
delete tele;
m_sentAesTelegrams.removeAt(i);
m_sentAesTelegramsAesIds.removeAt(i);