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,89 @@
|
||||
/**
|
||||
* Initialisation for Publisher
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "initialisation.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <DDS/DDSConnector/publisher.h>
|
||||
|
||||
#include <ExerciseManagement/exm.hpp>
|
||||
#include <ExerciseManagement/exm_enums.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QVariant>
|
||||
#include <QDateTime>
|
||||
|
||||
namespace DataSampleGenerator
|
||||
{
|
||||
|
||||
Initialisation::Initialisation(int domainId, int exerciseId)
|
||||
: DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)
|
||||
, m_isUsed(0)
|
||||
, m_participantId(222)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("DataSampleGenerator.Initialisation"))
|
||||
|
||||
{
|
||||
INFO_LOG(m_logger) << "Initialisation for partition: " << getDefaultPartition();
|
||||
}
|
||||
|
||||
bool Initialisation::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!DDSConnector::DdsConnector::init(qosFileList))
|
||||
return false;
|
||||
|
||||
// Initialisation publisher
|
||||
initPublisher();
|
||||
return true;
|
||||
}
|
||||
|
||||
void Initialisation::generateTestData(const QString &type)
|
||||
{
|
||||
m_isUsed = !m_isUsed;
|
||||
|
||||
if (type == QLatin1String("ExerciseManagement::Exercise"))
|
||||
{
|
||||
ExerciseManagement::Exercise data;
|
||||
|
||||
data.id(999);
|
||||
data.name("TestExe");
|
||||
data.isUsed(m_isUsed);
|
||||
data.partitionName("Exe999");
|
||||
data.state(ExerciseManagement::ExerciseState::Started);
|
||||
data.isDeleted(false);
|
||||
|
||||
getPublisher()->write(data);
|
||||
|
||||
}
|
||||
else if (type == QLatin1String("ParticipantManagement::ExerciseParticipant"))
|
||||
{
|
||||
ParticipantManagement::Participant data;
|
||||
|
||||
data.id(m_participantId);
|
||||
data.symbol(std::string("231"));
|
||||
//data.relatedUnit(1);
|
||||
|
||||
data.equipmentNumber (1111);
|
||||
|
||||
data.isSimulated(true);
|
||||
data.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
//data.isNBCProtectionActivated(false);
|
||||
|
||||
getPublisher()->write(data);
|
||||
|
||||
data.id(m_participantId+10);
|
||||
getPublisher()->write(data);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
WARNING_LOG(m_logger) << "TopicType " << type << " not implemented.";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
} // Namespace DataSampleGenerator
|
||||
Reference in new issue
Block a user