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.1 KiB
C++
80 lines
2.1 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
*
|
|
* Subscriber (DataSampleReceiver)
|
|
* Uses DDTCs to subscribe to data
|
|
*
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#include "subscriber.h"
|
|
#include "telegrammodel.h"
|
|
|
|
namespace DdsView
|
|
{
|
|
|
|
Subscriber::Subscriber(const dds::domain::DomainParticipant &domainParticipant,
|
|
const std::string &partition,
|
|
TelegramModel *tm)
|
|
: DDSConnector::Subscriber(domainParticipant, partition)
|
|
, m_telegramModel(tm)
|
|
, m_logger(DdsView::getLogger("Subscriber"))
|
|
{}
|
|
|
|
Subscriber::~Subscriber()
|
|
{
|
|
qDeleteAll(m_ddtcMap);
|
|
m_ddtcMap.clear();
|
|
}
|
|
|
|
void Subscriber::processData(const dds::core::xtypes::DynamicData &data, const QString &topicName, DataModification modType)
|
|
{
|
|
m_telegramModel->processData(data, topicName, modType);
|
|
}
|
|
|
|
bool Subscriber::initDDTCs(const QVector<DDSGeneric::TopicDescription> &vDro)
|
|
{
|
|
// TODO: remove old droEntries
|
|
|
|
QMap<std::string, ddtc *> newTopics;
|
|
|
|
for (const DDSGeneric::TopicDescription &ti : vDro)
|
|
{
|
|
auto it = m_ddtcMap.find(ti.name);
|
|
if (it != m_ddtcMap.end())
|
|
{
|
|
// already there
|
|
newTopics.insert(it.key(), it.value());
|
|
m_ddtcMap.erase(it);
|
|
continue;
|
|
}
|
|
|
|
DTC::Ddtc<DDSGeneric::DynamicDataReader> *ddtc = this->create(
|
|
[this](const dds::core::xtypes::DynamicData & data, const std::string & topicName, DataModification modType)
|
|
{ processData(data, QString::fromStdString(topicName), modType); },
|
|
ti.type,
|
|
nullptr /* Use SubscriberListener from DdsConnector */,
|
|
ti.name
|
|
);
|
|
if (ddtc == nullptr)
|
|
{
|
|
ERROR_LOG(m_logger) << "Can't create ddtc for Topic (" << ti.name << "), TypeName (" << ti.typeName << ")";
|
|
continue;
|
|
}
|
|
|
|
if (ddtc->hasSamples())
|
|
{
|
|
for (const auto &data : ddtc->readAlive())
|
|
processData(data.data(), QString::fromStdString(ti.name), DataModification::eAdded);
|
|
}
|
|
newTopics.insert(ti.name, ddtc);
|
|
}
|
|
qDeleteAll(m_ddtcMap);
|
|
m_ddtcMap = newTopics;
|
|
|
|
return true;
|
|
} // end initDDTCs()
|
|
|
|
} // Namespace DdsView
|