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:
torstenandCopilot committed 2026-09-15 18:20:26 +00:00
1 parent f23384bb68
commit 7173785915
18662 files changed
+4115092 -5435

No files matched your search

@@ -0,0 +1,23 @@
#
# $Id$
# $HeadURL$
# $Author$
# Created by Mike Wille, SLSE, 2016-09-06
#
#
# Data Plugin
#
NGL_ADD_LIBRARY(WS OpmDataPlugin MODULE opm_data_plugin.cpp opm_data_plugin.h)
NGL_TARGET_LINK_LIBRARIES(OpmDataPlugin
Qt5::Core
OpmDataPluginInterface
svcOpmClient
NGLLogger
LtsSessionDataDds
LtsUtilsSettings # user-settings
LtsUtilsGuiDds # dds-vec => QByteArray
LtsSessionData
ddsconnector
)
NGL_INSTALL_TARGET(OpmDataPlugin)
@@ -0,0 +1,102 @@
/**
* @RDE_HEADER@
* Data Plugin for ExerciseManangement
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-02-29
*/
#include "opm_data_plugin.h"
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsSession/lts_session_data_dds.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsSession/lts_session_data.h>
#include <Plugins/OperatorManagement/opm_gui_plugin_interface.h>
#include <Services/OperatorManagement/logger.h>
#include <QDateTime>
#include <QTimer>
namespace OperatorManagement
{
std::shared_ptr<DataPluginBase::Interface> DataPlugin::createDataInterface(LtsSession::LtsSessionDataDds *session)
{
std::shared_ptr<Interface::Dtc> dtc;
std::shared_ptr<Interface::Ftc> ftc;
if (!session->createTopicClient(dtc, ftc, false, true))
return std::shared_ptr<DataPluginBase::Interface>();
return std::make_shared<DataInterfaceImpl>(dtc, ftc, session);
}
DataInterfaceImpl::DataInterfaceImpl(const std::shared_ptr<OperatorManagement::Interface::Dtc> &dtc,
const std::shared_ptr<OperatorManagement::Interface::Ftc> &ftc,
LtsSession::LtsSessionDataDds *session)
: DataInterface()
, m_dtc(dtc)
, m_ftc(ftc)
, m_foreignInterface(std::make_shared<ForeignInterfaceImpl>(dtc, ftc, session))
{}
ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<OperatorManagement::Interface::Dtc> &dtc,
const std::shared_ptr<OperatorManagement::Interface::Ftc> &ftc,
LtsSession::LtsSessionDataDds *session)
: m_dtc(dtc)
, m_ftc(ftc)
, m_session(session)
, m_timer(nullptr)
{
// bleibt Global immer geladen? Wenn nein, IDL::PartitionType::Exercise auch noch nötig
if (m_session->partitionType() == IDL::PartitionType::Global)
{
auto ddsConnector = m_session->ddsConnector();
m_dtsOperatorWorkstationAlive.reset(ddsConnector->createDTS<DTS::OperatorWorkstationAliveImpl>());
// send KeepAlive - Messages every n seconds
m_timer = new QTimer(this);
connect(m_timer, &QTimer::timeout, this, &ForeignInterfaceImpl::onSendKeepAlive);
m_timer->setSingleShot(false);
onSendKeepAlive();
}
}
ForeignInterfaceImpl::~ForeignInterfaceImpl()
{
if (m_dtsOperatorWorkstationAlive)
{
const auto inst = LtsSessionData::LtsSessionData::getInstance();
if (inst->getWorkstationId() > 0)
{
const OperatorWorkstationAlive alive(inst->getWorkstationId(), 0, 0);
m_dtsOperatorWorkstationAlive->remove(alive);
}
}
}
void ForeignInterfaceImpl::onSendKeepAlive()
{
if (!m_timer)
return;
m_timer->start(30 * 1000); // every 30s
if (!m_dtsOperatorWorkstationAlive)
return;
const auto inst = LtsSessionData::LtsSessionData::getInstance();
if (inst->getWorkstationId() <= 0)
return;
const OperatorWorkstationAlive alive(inst->getWorkstationId(),
inst->getOperatorId(),
QDateTime::currentMSecsSinceEpoch());
m_dtsOperatorWorkstationAlive->write(alive);
}
} // namespace OperatorManagement
@@ -0,0 +1,77 @@
/**
* @RDE_HEADER@
* Data Plugin for OperatorManagement
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-02-29
*/
#pragma once
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_dts_types.h>
#include <DDS/DTS/generic_dts_impl.h>
class QTimer;
namespace OperatorManagement
{
class DataPlugin final : public QObject, public DataPluginBase::Plugin
{
Q_PLUGIN_METADATA(IID "data:3:opm")
Q_INTERFACES(DataPluginBase::Plugin)
Q_OBJECT
public:
DataPlugin() = default;
~DataPlugin() = default;
QString pluginName() const override { return QStringLiteral("OperatorManagement"); }
std::shared_ptr<DataPluginBase::Interface> createDataInterface(LtsSession::LtsSessionDataDds *session) override;
bool availableInPartition(IDL::PartitionType partition) const override
{
return partition == IDL::PartitionType::Global ||
partition == IDL::PartitionType::Exercise ||
partition == IDL::PartitionType::Replay;
}
};
class DataInterfaceImpl final : public DataInterface
{
public:
DataInterfaceImpl(const std::shared_ptr<OperatorManagement::Interface::Dtc> &dtc,
const std::shared_ptr<OperatorManagement::Interface::Ftc> &ftc,
LtsSession::LtsSessionDataDds *session);
std::shared_ptr<OperatorManagement::Interface::Dtc> getDtc() override { return m_dtc; }
std::shared_ptr<OperatorManagement::Interface::Ftc> getFtc() override { return m_ftc; }
std::shared_ptr<ForeignDataInterface> getForeignDataInterface() override { return m_foreignInterface; }
private:
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
std::shared_ptr<ForeignDataInterface> m_foreignInterface;
};
class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
{
Q_OBJECT
public:
ForeignInterfaceImpl(const std::shared_ptr<OperatorManagement::Interface::Dtc> &dtc,
const std::shared_ptr<OperatorManagement::Interface::Ftc> &ftc,
LtsSession::LtsSessionDataDds *session);
~ForeignInterfaceImpl();
void onSendKeepAlive() override;
private:
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
std::unique_ptr<DTS::OperatorWorkstationAlive> m_dtsOperatorWorkstationAlive;
LtsSession::LtsSessionDataDds *m_session;
QTimer *m_timer;
};
} // namespace OperatorManagement