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,94 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The DataManager class is a convenience class for managing structure data
|
||||
* offers an interface to get and set structure data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-03-27
|
||||
*/
|
||||
#include "WebSocketInterface/data_manager.h"
|
||||
|
||||
#include <QVector>
|
||||
|
||||
namespace OcBaseDownload
|
||||
{
|
||||
namespace WebSocketInterface
|
||||
{
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
DataManager::DataManager(MainHandler *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_currentDownload(CurrentDownload::NOTHING)
|
||||
, m_logger(getLogger(QStringLiteral("DataManager")))
|
||||
{
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::handleErrorMessage(const OcBaseDownload::WebSocketInterface::Messages::ErrorMessage::ErrorData &errData)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsInformation::ExerciseInformation> &exerciseInformation)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got ServicePortsInformation from websocket";
|
||||
switch (m_currentDownload)
|
||||
{
|
||||
case CurrentDownload::PDF:
|
||||
m_mainHandler->handlerPdfDownload()->handleServicePortsInformation(exerciseInformation);
|
||||
break;
|
||||
case CurrentDownload::BASE:
|
||||
//m_mainHandler->handlerBaseDownload()->handleServicePortsInformation(exerciseInformation);
|
||||
break;
|
||||
case CurrentDownload::NOTHING:
|
||||
default:
|
||||
WARNING_LOG(m_logger) << "Got Ports Information in neither BASE nor PDF download mode";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::handlePdfListMessage(const Messages::PdfListMessage::PdfListData &pdfListData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got PDF list from websocket";
|
||||
m_mainHandler->handlerPdfDownload()->handlePdfListData(pdfListData);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
void DataManager::setCurrentDownload(CurrentDownload currentDownload)
|
||||
{
|
||||
m_currentDownload = currentDownload;
|
||||
|
||||
switch (m_currentDownload)
|
||||
{
|
||||
case CurrentDownload::PDF:
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to PDF";
|
||||
m_mainHandler->dds()->fts()->enableStartBaseDownload(false);
|
||||
m_mainHandler->dds()->fts()->enableGetPdfList();
|
||||
m_mainHandler->dds()->fts()->enableStartPdfDownload();
|
||||
break;
|
||||
case CurrentDownload::BASE:
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to BASE";
|
||||
m_mainHandler->dds()->fts()->enableStartBaseDownload();
|
||||
m_mainHandler->dds()->fts()->enableGetPdfList(false);
|
||||
m_mainHandler->dds()->fts()->enableStartPdfDownload(false);
|
||||
break;
|
||||
case CurrentDownload::NOTHING:
|
||||
DEBUG_LOG(m_logger) << "Setting current download mode to NOTHING";
|
||||
m_mainHandler->dds()->fts()->enableAll();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
CurrentDownload DataManager::currentDownload() const
|
||||
{
|
||||
return m_currentDownload;
|
||||
}
|
||||
|
||||
} // namespace WebSocketInterface
|
||||
} // namespace OcBaseDownload
|
||||
Reference in new issue
Block a user