BUILD_RTI guards: svcTabCommon export header + GuezMinelayerProcessing stubs

- TrainingAreaBase/CMakeLists.txt: Wrap RTIDDSGEN with BUILD_RTI, add fallback target
- GuezMinelayerProcessing: BUILD_RTI guards for HandlerMinelayerData + stubs
- ddsfts/CMakeLists.txt: Fix INTERFACE→PUBLIC, add svcTabCommon dependency
- Add stub headers for BUILD_RTI=OFF compilation

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-21 19:27:34 +02:00
1 parent 950d669538
commit 6588fc7d3f
8 files changed
+109 -39

No files matched your search

@@ -24,7 +24,6 @@ DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsCon
#else
DdsHandler::DdsHandler()
: m_logger(getNGLLogger("GuezMinelayerProcessing.DdsHandler"))
, m_topicLockMaster(std::make_shared<Core::TopicLockMaster>())
{
DEBUG_LOG(m_logger) << "DdsHandler() - RTI DDS not enabled";
}
@@ -29,15 +29,15 @@ public:
#if BUILD_RTI
std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
#endif
std::shared_ptr<Core::TopicLockMaster> topicLockMaster() const { return m_topicLockMaster; }
#endif
private:
NGL::INGLLogger &m_logger;
#if BUILD_RTI
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
#endif
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
#endif
};
}
@@ -29,9 +29,9 @@ HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &dd
QObject *parent)
: QObject(parent)
, m_ddsHandler(ddsHandler)
#if BUILD_RTI
, m_tabDtc(nullptr)
, m_ppmDtc(nullptr)
#if BUILD_RTI
, m_aesFtc(nullptr)
#endif
, m_minefieldInterpreter(new ZSSI_WI_Minenfeld_Interpreter(this))
@@ -97,7 +97,7 @@ bool HandlerMinelayerData::init()
return ret;
}
void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType)
void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType)
{
if (modType != DataModification::eAdded &&
modType != DataModification::eModified)
@@ -158,7 +158,7 @@ void HandlerMinelayerData::convertMinelayerDataToXdrData(const TrainingAreaBase:
outData.verlegedaten.anzahl_verlegter_minen = inData.mineCount();
}
void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType)
void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType)
{
if ((modType == DataModification::eAdded) ||
(modType == DataModification::eModified))
@@ -201,7 +201,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
}
}
void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType)
void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType)
{
if ((modType == DataModification::eAdded) ||
(modType == DataModification::eModified))
@@ -367,4 +367,20 @@ void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::Function
} // namespace GuezMinelayerProcessing
#else // BUILD_RTI
namespace GuezMinelayerProcessing
{
HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent)
: QObject(parent)
, m_ddsHandler(ddsHandler)
{}
HandlerMinelayerData::~HandlerMinelayerData()
{}
} // namespace GuezMinelayerProcessing
#endif // BUILD_RTI
@@ -12,24 +12,25 @@
#include <QPointF>
#include <QTimer>
#if BUILD_RTI
#include <AreaEffectSimulation/aes_ftc.h>
#include <Proxies/TrainingAreaBase/tab_dtc.h>
#endif
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ParticipantManagement/ppm.hpp>
#include "GFS_map_cont.h"
#include "logger.h"
#if BUILD_RTI
#include <AreaEffectSimulation/aes_ftc.h>
#include <Proxies/TrainingAreaBase/tab_dtc.h>
#endif
namespace GuezMinelayerProcessing
{
class DdsHandler;
class ZSSI_WI_Minenfeld_Interpreter;
class HandlerMinelayerData : public QObject
#if BUILD_RTI
class HandlerMinelayerData : public QObject
, protected AreaEffectSimulation::Interface::Ftc::MineAreaModifyFromCtaDataReplyHandler
#endif
{
Q_OBJECT
public:
@@ -39,14 +40,12 @@ public:
bool init();
#if BUILD_RTI
void onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject) override final;
#endif
private slots:
void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType);
void onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType);
void onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType);
void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType);
void onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType);
void onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType);
void onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt);
void onStartMinefieldInterpreter ();
@@ -61,13 +60,29 @@ private:
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_tabDtc;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
#if BUILD_RTI
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_aesFtc;
#endif
LtsCoordTrans::UtmCoordinate m_baseCoord;
ZSSI_WI_Minenfeld_Interpreter *m_minefieldInterpreter;
QTimer *m_minefieldInterpreterTimer;
};
#else
// Stub implementation when BUILD_RTI is OFF
class HandlerMinelayerData : public QObject
{
Q_OBJECT
public:
explicit HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent = nullptr);
~HandlerMinelayerData();
bool init() { return false; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
};
#endif // BUILD_RTI
} // namespace GuezMinelayerProcessing