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,58 @@
|
||||
/**
|
||||
* Initialisation for Subscriber
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "initialisation.h"
|
||||
#include "subscriber.h"
|
||||
|
||||
#include <DDS/DDSConnector/publisher.h>
|
||||
|
||||
namespace DdsView
|
||||
{
|
||||
|
||||
Initialisation::Initialisation(const dds::domain::DomainParticipant &dp,
|
||||
int domainId, IDL::PartitionType partitionType,
|
||||
int exerciseId, TelegramModel *tm)
|
||||
: DDSConnector::DdsConnector(domainId, partitionType, exerciseId)
|
||||
, m_logger(DdsView::getLogger("Initialisation"))
|
||||
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Initialisation for partition: " << getDefaultPartition();
|
||||
initDDS(dp, tm);
|
||||
}
|
||||
|
||||
void Initialisation::initDDS(const dds::domain::DomainParticipant &dp, TelegramModel *tm)
|
||||
{
|
||||
DDSConnector::DdsConnector::init();
|
||||
|
||||
// Initialisation Subscriber
|
||||
setSubscriber(new DdsView::Subscriber(dp, getDefaultPartition(), tm));
|
||||
|
||||
// Initialisation Publisher
|
||||
// Note (!): The publisher has its own domainParticipant
|
||||
setPublisher(new DDSConnector::Publisher(dds::domain::DomainParticipant(getDomainId()), getDefaultPartition()));
|
||||
|
||||
if (getPublisher()->getDomainParticipant() == nullptr)
|
||||
return;
|
||||
|
||||
// Enable DomainParticipant
|
||||
// Default-QoS Configuration for enabled => false (using Qos from DefaultParticipant)
|
||||
dds::domain::DomainParticipant &pubDp = const_cast<dds::domain::DomainParticipant &>(getPublisher()->getDomainParticipant());
|
||||
pubDp->enable();
|
||||
}
|
||||
|
||||
bool Initialisation::initDDTCs(const QVector<DDSGeneric::TopicDescription> &vDro)
|
||||
{
|
||||
DdsView::Subscriber *sub = dynamic_cast<DdsView::Subscriber *>(getSubscriber());
|
||||
return sub ? sub->initDDTCs(vDro) : false;
|
||||
}
|
||||
|
||||
bool Initialisation::publish(const dds::core::xtypes::DynamicData &data, const std::string &topicName)
|
||||
{
|
||||
return getPublisher() ? getPublisher()->write(data, topicName) : false;
|
||||
}
|
||||
|
||||
} // Namespace DdsView
|
||||
Reference in new issue
Block a user