torstenandCopilot
7173785915
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>
80 lines
2.4 KiB
C++
80 lines
2.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
*
|
|
* Subscriber (Common)
|
|
* Uses DDTCs to subscribe to data
|
|
*
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include "pub_sub_base.h"
|
|
|
|
#include <DDS/Generic/dynamic_data_reader.h>
|
|
#include <DDS/DTC/generic_dtc_impl.h>
|
|
#include <DDS/Generic/topic_description.h>
|
|
#include <rti/core/ListenerBinder.hpp>
|
|
|
|
namespace NGL
|
|
{
|
|
class INGLLogger;
|
|
}
|
|
|
|
namespace DDSConnector
|
|
{
|
|
class DDSCONNECTOR_EXPORT Subscriber : public PubSubBase
|
|
{
|
|
|
|
public:
|
|
Subscriber(const dds::domain::DomainParticipant &domainParticipant, const std::string &partition, bool bUseSubscriberListener = true);
|
|
virtual ~Subscriber();
|
|
|
|
dds::sub::Subscriber getDdsSubscriber() const { return m_ddsSubscriber; }
|
|
DDSGeneric::SubscriberListener *getSubscriberListener() { return m_subscriberListener; }
|
|
|
|
template <typename DTC_TYPE>
|
|
DTC_TYPE *create(std::function<void(const typename DTC_TYPE::TopicTypeRead &, DataModification modType)> cb)
|
|
{
|
|
DTC_TYPE* dtc = new DTC_TYPE;
|
|
if (!dtc->create(m_domainParticipant, m_ddsSubscriber, m_subscriberListener))
|
|
{
|
|
delete dtc;
|
|
return nullptr;
|
|
}
|
|
dtc->setSubscriberCallback(cb);
|
|
return dtc;
|
|
}
|
|
|
|
// Create new ddtc object
|
|
DTC::Ddtc<DDSGeneric::DynamicDataReader> *create(const std::function<void(const DDSGeneric::DynamicData &, const std::string &, DataModification modType)> &cb,
|
|
const dds::core::xtypes::StructType &structType,
|
|
DDSGeneric::SubscriberListener *listener = nullptr,
|
|
const std::string &specialTopicName = std::string())
|
|
{
|
|
if (!listener)
|
|
listener = getSubscriberListener();
|
|
|
|
DTC::DdtcImpl<DDSGeneric::DynamicDataReader> *ddtc =
|
|
new DTC::DdtcImpl<DDSGeneric::DynamicDataReader>(getDomainParticipant(),
|
|
getDdsSubscriber(),
|
|
listener,
|
|
structType,
|
|
specialTopicName);
|
|
ddtc->setSubscriberCallback(cb);
|
|
return ddtc;
|
|
}
|
|
|
|
protected:
|
|
void initDDS();
|
|
void deleteDDS();
|
|
|
|
protected:
|
|
dds::sub::Subscriber m_ddsSubscriber;
|
|
DDSGeneric::SubscriberListener *m_subscriberListener;
|
|
rti::core::ListenerBinder< dds::sub::Subscriber, dds::sub::SubscriberListener> m_subscriberListenerBinder;
|
|
};
|
|
|
|
}
|