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>
100 lines
3.5 KiB
Plaintext
100 lines
3.5 KiB
Plaintext
/**
|
|
* {{ namespace_abbr_upper }} Data Topic Client Interface
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-04-07
|
|
*/
|
|
|
|
{% autoescape off %}
|
|
// filename: {{ namespace_abbr }}_dtc_impl.h
|
|
#pragma once
|
|
|
|
#include <{{ include_prefix }}/{{ namespace_abbr }}_dtc.h>
|
|
#include <{{ include_prefix }}/{{ namespace_abbr }}_dtc_types.h>
|
|
#include <{{ include_prefix }}/logger.h>
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
|
|
#if !defined(MAKE_SVC{{ namespace_abbr_upper }}CLIENT_LIB)
|
|
#error "You are not allowed to include this file in your code!"
|
|
#endif
|
|
|
|
namespace {{ namespace }}
|
|
{
|
|
namespace Interface
|
|
{
|
|
template <typename UQ_DTC>
|
|
struct DtcConstraints
|
|
{
|
|
using DTC = typename UQ_DTC::element_type;
|
|
using TOPIC = typename DTC::TopicType;
|
|
};
|
|
|
|
template <typename TOPIC>
|
|
struct TopicConstraints
|
|
{};
|
|
|
|
class DtcImpl {% if not custom_dtc_procs %}final {%endif %}: public Dtc
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DtcImpl(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
|
|
~DtcImpl();
|
|
|
|
bool enableAll(bool enable = true) override;
|
|
{% for dt in dataTopics.member %} {% if dt.dtcImpl %}
|
|
//
|
|
// Data Topic '{{ dt.name }}'
|
|
//
|
|
public:
|
|
bool enable{{ dt.name }}(bool enable = true) override final;
|
|
bool is{{ dt.name }}Enabled() const override final { return m_dtc{{ dt.name }} != nullptr; }
|
|
bool waitForHistoricalData{{ dt.name }}(int timeoutMSec = -1) override final;
|
|
{% if dt.key.name %}
|
|
QMap<{{ dt.key.cppType }}, {{ namespace }}::{{ dt.type }}> {{ dt.nameFlc }}s() override final;
|
|
bool {{ dt.nameFlc }}s(const std::function<void(const {{ namespace }}::{{ dt.type }} &data)> &cb) override final;
|
|
bool {{ dt.nameFlc }}s(const std::function<bool(const {{ namespace }}::{{ dt.type }} &data)> &cb) override final;
|
|
{{ namespace }}::{{ dt.type }} {{ dt.nameFlc }}({{ dt.key.cppTypeCr }} {{ dt.key.nameFlc }}) override final;
|
|
{% else %}
|
|
{{ namespace }}::{{ dt.type }} {{ dt.nameFlc }}() override final;
|
|
{% endif %} {% endif %} {% endfor %}
|
|
|
|
private:
|
|
template <typename DTC>
|
|
bool checkEnabled(const DTC &dtc) const;
|
|
template <typename DTC>
|
|
bool waitForHistoricalData(DTC &dtc, int timeoutMSec);
|
|
template <typename DTC,
|
|
typename T = typename DtcConstraints<DTC>::TOPIC,
|
|
typename K = typename TopicConstraints<T>::KEY>
|
|
QMap<K, T> getAll(const DTC &dtc) const;
|
|
template <typename DTC, typename C,
|
|
typename T = typename DtcConstraints<DTC>::TOPIC,
|
|
typename K = typename TopicConstraints<T>::KEY>
|
|
T getOne(const DTC &dtc, const C &cont, const K &key) const;
|
|
template <typename DTC, typename C,
|
|
typename T = typename DtcConstraints<DTC>::TOPIC>
|
|
bool iterateAll(const DTC &dtc, const C &cont, const std::function<void(const T &data)> &cb) const;
|
|
template <typename DTC, typename C,
|
|
typename T = typename DtcConstraints<DTC>::TOPIC>
|
|
bool iterateUntil(const DTC &dtc, const C &cont, const std::function<bool(const T &data)> &cb) const;
|
|
|
|
protected:
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
|
|
{% for dt in dataTopics.member %}
|
|
{% if dt.dtcImpl %}
|
|
void {{ dt.nameFlc }}ChangedInternal(const {{ namespace }}::{{ dt.type }} &data, DataModification modType);
|
|
std::unique_ptr<DTC::{{ dt.name }}> m_dtc{{ dt.name }}; {% if dt.key.name %}
|
|
QMap<{{ dt.key.cppType }}, {{ namespace }}::{{ dt.type }}> m_{{ dt.nameFlc }}Cont; {% else %}
|
|
{{ namespace }}::{{ dt.type }} m_{{ dt.nameFlc }};
|
|
{% endif %} {% endif %} {% endfor %}
|
|
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
} // namespace Interface
|
|
} // namespace {{ namespace }}
|
|
{% endautoescape %}
|