Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
72 lines
1.9 KiB
C++
72 lines
1.9 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* DTC TypeDefinitions
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
#include <LtsUtilsCore/data_modification_enum.h>
|
|
|
|
#include <dds/sub/LoanedSamples.hpp>
|
|
|
|
namespace NGLLogger
|
|
{
|
|
class INGLLogger;
|
|
}
|
|
|
|
namespace DTC
|
|
{
|
|
class SubscriberListener;
|
|
// uses DRO (static)
|
|
template <typename DRO_OBJECT, typename SC>
|
|
class GenericDtcSC
|
|
{
|
|
public:
|
|
using DataReaderObject = DRO_OBJECT;
|
|
using SubscriberCallback = SC;
|
|
using TopicType = typename DRO_OBJECT::TopicType;
|
|
|
|
GenericDtcSC() = default;
|
|
virtual ~GenericDtcSC() = default;
|
|
|
|
virtual bool setSubscriberCallback(const SubscriberCallback &subscriberCallback) = 0;
|
|
virtual dds::sub::LoanedSamples<TopicType> readAlive() const = 0;
|
|
virtual dds::sub::LoanedSamples<TopicType> takeAlive() const = 0;
|
|
virtual dds::sub::LoanedSamples<TopicType> takeDisposed() const = 0;
|
|
virtual bool hasSamples() const = 0;
|
|
virtual DataReaderObject *dataReader() const = 0;
|
|
virtual bool waitForHistoricalData(int timeoutMSec) = 0;
|
|
};
|
|
|
|
|
|
// Typed topic callback (DataReader)
|
|
template<typename DRO_OBJECT>
|
|
class GenericDtc
|
|
: public GenericDtcSC<DRO_OBJECT,
|
|
std::function<void(const typename DRO_OBJECT::TopicType &, DataModification)> >
|
|
{};
|
|
|
|
// Typed topic callback (DataReader) with SampleInfo
|
|
template<typename DRO_OBJECT>
|
|
class GenericDtcSampleInfo
|
|
: public GenericDtcSC<DRO_OBJECT,
|
|
std::function<void(const typename DRO_OBJECT::TopicType &, const dds::sub::SampleInfo &)> >
|
|
{};
|
|
|
|
// Dynamic topic callback (DynamicDataReader)
|
|
template<typename DRO_OBJECT>
|
|
class Ddtc
|
|
: public GenericDtcSC<DRO_OBJECT,
|
|
std::function<void(const typename DRO_OBJECT::TopicType &, const std::string &, DataModification)> >
|
|
{};
|
|
|
|
// Dynamic topic callback (DynamicDataReader) with SampleInfo
|
|
template<typename DRO_OBJECT>
|
|
class DdtcSampleInfo
|
|
: public GenericDtcSC<DRO_OBJECT,
|
|
std::function<void(const typename DRO_OBJECT::TopicType &, const std::string &, const dds::sub::SampleInfo &)> >
|
|
{};
|
|
}
|