Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,78 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* TopicData
|
||||
* Uses DDTCs to subscribe to data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <ExerciseManagement/exm.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <dds/dds.hpp>
|
||||
#include <dds/core/xtypes/DynamicData.hpp>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <DDS/DDSConnector/subscriber.h>
|
||||
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
namespace DataSampleReceiver
|
||||
{
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
||||
class TopicData : public DDSConnector::Subscriber
|
||||
{
|
||||
|
||||
public:
|
||||
explicit TopicData(const dds::domain::DomainParticipant &dp, const std::string &partition, const QVector<DDSGeneric::TopicDescription> &vDdro);
|
||||
~TopicData();
|
||||
|
||||
bool initDDTCs(const QVector<DDSGeneric::TopicDescription> &vDdro);
|
||||
|
||||
// Process data for specific topics
|
||||
void processData(const ExerciseManagement::Exercise &data);
|
||||
void processData(const ParticipantManagement::Participant &data);
|
||||
|
||||
bool processData(const dds::core::xtypes::DynamicData &data, const QString &ns = QString());
|
||||
|
||||
|
||||
// Process data as "typed" data
|
||||
template<typename T>
|
||||
bool processData(const dds::core::xtypes::DynamicData &data, const QString &topicName)
|
||||
{
|
||||
// TODO: really not needed?
|
||||
Q_UNUSED(topicName)
|
||||
if (rti::core::xtypes::can_convert<T>(data))
|
||||
{
|
||||
const T typedData = rti::core::xtypes::convert<T>(data);
|
||||
processData(typedData);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
protected:
|
||||
dds::core::xtypes::StructType getTypeCode(const std::string &topicName) const;
|
||||
|
||||
bool tryProcessDataAsTyped(const dds::core::xtypes::DynamicData &data, const QString &ns);
|
||||
|
||||
private:
|
||||
QVector<DDSGeneric::TopicDescription> m_vDdro;
|
||||
QMap<std::string, DTC::Ddtc<DDSGeneric::DynamicDataReader>*> m_ddtcMap;
|
||||
NGL::INGLLogger& m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user