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>
60 lines
1.3 KiB
C++
60 lines
1.3 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Routing Test - main connection handling
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <future>
|
|
|
|
#include "logger.h"
|
|
|
|
namespace RoutingService
|
|
{
|
|
class DataWriterTask;
|
|
class TopicDispatcherInterface;
|
|
|
|
class Connection
|
|
{
|
|
public:
|
|
Connection(const dds::domain::DomainParticipant &domainParticipant,
|
|
const std::string &partition,
|
|
const std::vector<TopicDispatcherInterface *> &topicsToRoute,
|
|
const std::string &desc);
|
|
~Connection();
|
|
|
|
// only valid before initialize() !
|
|
void setOutput(Connection *output);
|
|
bool initialize();
|
|
void shutdown();
|
|
|
|
dds::domain::DomainParticipant domainParticipant() const;
|
|
dds::pub::Publisher publisher() const;
|
|
dds::sub::Subscriber subscriber() const;
|
|
|
|
private:
|
|
bool initTopics();
|
|
|
|
private:
|
|
Connection *m_output;
|
|
dds::domain::DomainParticipant m_domainParticipant;
|
|
std::unique_ptr<DDSConnector::Publisher> m_publisher;
|
|
std::unique_ptr<DDSConnector::Subscriber> m_subscriber;
|
|
|
|
std::future<void> m_writerThread;
|
|
std::unique_ptr<DataWriterTask> m_dataWriterTask;
|
|
|
|
std::vector<TopicDispatcherInterface *> m_topicsToRoute;
|
|
|
|
std::string m_partition;
|
|
std::string m_description;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
|
|
} // namespace RoutingService
|