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>
94 lines
2.8 KiB
C++
94 lines
2.8 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* DataTopicServers (DTSs) - generic
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include "generic_dts.h"
|
|
#include <DDS/Generic/generic_data_writer.h>
|
|
#include <DDS/Generic/generic_logger.h>
|
|
|
|
namespace DTS
|
|
{
|
|
template<typename DWO_OBJECT>
|
|
class GenericDtsImpl final : public GenericDts<typename DWO_OBJECT::TopicType>
|
|
{
|
|
public:
|
|
using DataWriterObject = DWO_OBJECT;
|
|
using TopicType = typename DWO_OBJECT::TopicType;
|
|
using DataWriter = typename dds::pub::DataWriter<TopicType>;
|
|
|
|
GenericDtsImpl(const dds::domain::DomainParticipant &domainParticipant,
|
|
const dds::pub::Publisher &ddsPublisher,
|
|
const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name<TopicType>::value()))
|
|
: m_dataWriterObject(new DataWriterObject())
|
|
, m_logger(DDS::getLogger(DDS::topic_type_name<TopicType>::value(), DDS::DataType::DATA_TOPIC_SERVER))
|
|
{
|
|
Q_ASSERT(domainParticipant != nullptr);
|
|
Q_ASSERT(ddsPublisher != nullptr);
|
|
|
|
m_dataWriterObject->create(domainParticipant, ddsPublisher, topicName);
|
|
}
|
|
|
|
~GenericDtsImpl()
|
|
{
|
|
delete m_dataWriterObject;
|
|
}
|
|
|
|
bool write(const TopicType &data,
|
|
const dds::core::optional<dds::sub::SampleInfo> &si = dds::core::optional<dds::sub::SampleInfo>()) override final
|
|
{
|
|
DEBUG_LOG(m_logger) << "IN write ("
|
|
<< DDS::topic_type_name<TopicType>::value()
|
|
<< ")";
|
|
|
|
if (!m_dataWriterObject)
|
|
return false;
|
|
|
|
if (!m_dataWriterObject->write(data, si))
|
|
{
|
|
ERROR_LOG(m_logger) << "Error writing for "
|
|
<< DDS::topic_type_name<TopicType>::value();
|
|
return false;
|
|
}
|
|
DEBUG_LOG(m_logger) << "TopicData ("
|
|
<< DDS::topic_type_name<TopicType>::value()
|
|
<< ") written";
|
|
|
|
return true;
|
|
}
|
|
|
|
bool remove(const TopicType &data, bool errorMsgIfNotExists = true) override final
|
|
{
|
|
DEBUG_LOG(m_logger) << "IN remove ("
|
|
<< DDS::topic_type_name<TopicType>::value()
|
|
<< ")";
|
|
|
|
if (!m_dataWriterObject)
|
|
return false;
|
|
|
|
if (!m_dataWriterObject->remove(data, errorMsgIfNotExists))
|
|
{
|
|
if (errorMsgIfNotExists)
|
|
ERROR_LOG(m_logger) << "Error removing for "
|
|
<< DDS::topic_type_name<TopicType>::value();
|
|
return false;
|
|
}
|
|
DEBUG_LOG(m_logger) << "TopicData ("
|
|
<< DDS::topic_type_name<TopicType>::value()
|
|
<< ") removed";
|
|
|
|
return true;
|
|
}
|
|
|
|
private:
|
|
// DataWriterObjects (DWOs)
|
|
DataWriterObject *m_dataWriterObject;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
|
|
} // Namespace DTS
|