Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599

No files matched your search

@@ -9,7 +9,9 @@
#include "handler_minelayer_data.h"
#if BUILD_RTI
#include <AreaEffectSimulation/aes_ftc.h>
#endif
#include <AssetManagement/asm_dtc.h>
#include <ExerciseManagement/exm_dtc.h>
@@ -18,6 +20,8 @@
#include <QLineF>
#if BUILD_RTI
namespace GuezMinelayerProcessing
{
@@ -27,7 +31,9 @@ HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &dd
, m_ddsHandler(ddsHandler)
, m_tabDtc(nullptr)
, m_ppmDtc(nullptr)
#if BUILD_RTI
, m_aesFtc(nullptr)
#endif
, m_minefieldInterpreter(new ZSSI_WI_Minenfeld_Interpreter(this))
, m_minefieldInterpreterTimer(new QTimer(this))
{}
@@ -37,19 +43,24 @@ HandlerMinelayerData::~HandlerMinelayerData()
bool HandlerMinelayerData::init()
{
#if BUILD_RTI
// AES-Ftc
m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->ddsConnector());
bool ret = m_aesFtc->enableMineAreaModifyFromCtaData();
if (!ret)
{
ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaCreateFromCtaData()";
ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaModifyFromCtaData()";
return false;
}
#endif
// Data from training area base
m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->ddsConnector());
bool ret = true;
#if BUILD_RTI
ret &= m_tabDtc->enableSpecialSensorData();
#endif
ret &= m_tabDtc->enableMinelayerTrailerData();
ret &= m_tabDtc->enableMinelayerThrowerData();
if (!ret)
@@ -58,13 +69,17 @@ bool HandlerMinelayerData::init()
return false;
}
#if BUILD_RTI
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::specialSensorDataChanged, this, &HandlerMinelayerData::onSpecialSensorDataChanged);
#endif
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerTrailerDataChanged, this, &HandlerMinelayerData::onMinelayerTrailerData);
connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerThrowerDataChanged, this, &HandlerMinelayerData::onMinelayerThrowerData);
// PPM for partyId Mapping
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
#if BUILD_RTI
ret &= m_ppmDtc->enableParticipant();
#endif
if (!ret)
{
ERROR_LOG(m_logger) << "PpmDtc Can not enable Participant Data";
@@ -290,6 +305,7 @@ static inline double compassFromMathAngleForSfm(int mathAngle)
void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt)
{
#if BUILD_RTI
AreaEffectSimulation::MineArea outData;
outData.participantId(minefield.header.identitaet);
outData.partyId(partyIdFromEquipmentNumber(minefield.header.identitaet)); // Get from PPM;
@@ -332,7 +348,7 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
// request create mine area from aes
m_aesFtc->mineAreaModifyFromCtaDataRequest(outData, this);
#endif
}
void HandlerMinelayerData::onStartMinefieldInterpreter()
@@ -349,4 +365,6 @@ void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::Function
INFO_LOG(m_logger) << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
}
}
} // namespace GuezMinelayerProcessing
#endif // BUILD_RTI