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,80 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The DataManager class takes strucure element data from the HandlerStructureElement,
|
||||
* offers an interface to get and set structure data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#include "WebSocketInterface/data_manager.h"
|
||||
|
||||
#include "main_handler.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QMap>
|
||||
#include <QVector>
|
||||
|
||||
namespace ServiceManagement
|
||||
{
|
||||
namespace WebSocketInterface
|
||||
{
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
DataManager::DataManager(MainHandler *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger(QStringLiteral("DataManager")))
|
||||
{
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
bool DataManager::init()
|
||||
{
|
||||
m_groupHandler = m_mainHandler->groupHandler();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
LtsWebSocket::ReplyMessage *DataManager::servicesInformation(const QString &uuid) const
|
||||
{
|
||||
using namespace Messages;
|
||||
|
||||
const QVector<Group *> groups = m_groupHandler->groups();
|
||||
QVector<ServicePortsInformationMessage::ExerciseInformation> data;
|
||||
data.reserve(groups.size());
|
||||
for (auto group : groups)
|
||||
{
|
||||
const QMap<int, ServiceProcess *> serviceProcs = group->serviceProcs();
|
||||
ServicePortsInformationMessage::ExerciseInformation exerciseInfo;
|
||||
|
||||
for (ServiceProcess *service : serviceProcs)
|
||||
{
|
||||
if (service->ports().is_set())
|
||||
{
|
||||
ServicePortsInformationMessage::ServiceInformation serviceInfo;
|
||||
serviceInfo.name = service->serviceName();
|
||||
serviceInfo.abbreviation = service->abbreviation();
|
||||
|
||||
const auto ports = service->ports().get();
|
||||
for (const auto &port : ports)
|
||||
serviceInfo.ports.append(ServicePortsInformationMessage::PortInformation({port.number(), port.type().underlying(), QString::fromStdString(port.properties())}));
|
||||
|
||||
exerciseInfo.services.append(serviceInfo);
|
||||
}
|
||||
}
|
||||
|
||||
if (!exerciseInfo.services.isEmpty())
|
||||
{
|
||||
exerciseInfo.exerciseId = group->exercisePartitionId();
|
||||
exerciseInfo.replayPartitionId = group->replayPartitionId();
|
||||
data.append(exerciseInfo);
|
||||
}
|
||||
}
|
||||
|
||||
return new ServicePortsInformationMessage(data, uuid);
|
||||
}
|
||||
|
||||
} // namespace WebSocketInterface
|
||||
} // namespace ServiceManagement
|
||||
Reference in new issue
Block a user