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>
65 lines
1.5 KiB
C++
65 lines
1.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Routing Test - main object
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <QMap>
|
|
|
|
#include <RoutingServiceNG/rsccommon_export.h>
|
|
#include "logger.h"
|
|
#include "session.h"
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
|
|
namespace LtsPluginManager
|
|
{
|
|
struct PluginInstance;
|
|
}
|
|
namespace DDSGeneric
|
|
{
|
|
class TopicTypePlugin;
|
|
}
|
|
|
|
namespace RoutingService
|
|
{
|
|
class TopicDispatcherInterface;
|
|
|
|
class RSCCOMMON_EXPORT SessionHandler : public QObject
|
|
{
|
|
public:
|
|
SessionHandler(IDL::PartitionType partitionType,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnectorSv,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnectorWs);
|
|
~SessionHandler();
|
|
|
|
bool init();
|
|
void shutdown();
|
|
|
|
public Q_SLOTS:
|
|
void onCreateSession(const QString &partitionNameSv, const QString &partitionNameWs);
|
|
void onDestroySession(const QString &partitionNameSv, const QString &partitionNameWs);
|
|
private:
|
|
bool loadPlugins();
|
|
bool loadPlugin(const LtsPluginManager::PluginInstance &pi);
|
|
|
|
std::vector<TopicDispatcherInterface *> topicsToRouteToWs() const;
|
|
std::vector<TopicDispatcherInterface *> topicsToRouteToSv() const;
|
|
|
|
private:
|
|
std::vector<DDSGeneric::TopicTypePlugin *> m_topicTypePlugins;
|
|
|
|
IDL::PartitionType m_partitionType;
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnectorSv;
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnectorWs;
|
|
|
|
QMap<QString, Session *> m_sessionMap;
|
|
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
} // namespace RoutingService
|