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,86 @@
|
||||
/**
|
||||
* Handler for PDF download coordination
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, NLE, 26-04-2019
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
// dds
|
||||
#include <OcBaseDownload/obd_fts.h>
|
||||
#include <QSqlDatabase>
|
||||
#include <FileManagement/flm_db.h>
|
||||
#include <FileManagement/flm_db_impl_custom.h>
|
||||
#include "WebSocketInterface/Messages/client_message.h"
|
||||
#include "WebSocketInterface/websocket_interface_handler.h"
|
||||
#include "pdf_download_socket.h"
|
||||
#include "logger.h"
|
||||
|
||||
namespace OcBaseDownload
|
||||
{
|
||||
class PdfDownloader;
|
||||
class MainHandler;
|
||||
class HandlerPdfDownload : public QObject
|
||||
, protected Interface::Fts::GetPdfListRequestHandler
|
||||
, protected Interface::Fts::StartPdfDownloadRequestHandler
|
||||
, protected Interface::Fts::OcPdfDownloadRequestHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerPdfDownload(MainHandler *mainHandler,
|
||||
QObject *parent = nullptr);
|
||||
~HandlerPdfDownload();
|
||||
|
||||
bool init();
|
||||
|
||||
void handleServicePortsInformation(const QVector<WebSocketInterface::Messages::ServicePortsInformation::ExerciseInformation> &portsInformation);
|
||||
void handlePdfListData(const WebSocketInterface::Messages::PdfListMessage::PdfListData &pdfListData);
|
||||
|
||||
void onGetPdfListRequest(const rti::core::SampleIdentity &cookie, const GetPdfListRequest &request) override final;
|
||||
void onStartPdfDownloadRequest(const rti::core::SampleIdentity &cookie, const StartPdfDownloadRequest &request) override final;
|
||||
void onOcPdfDownloadRequest(const rti::core::SampleIdentity &cookie, const OcPdfDownloadRequest &request )override final;
|
||||
void exportOcPdfFileContent();
|
||||
bool openRemoteDbConnection(const QString &remoteDatabaseName);
|
||||
QSqlDatabase openDb(const QString &databaseName, bool remote, bool *bOk);
|
||||
void closeDb(QSqlDatabase &dbConn);
|
||||
|
||||
private Q_SLOTS:
|
||||
void onConnected();
|
||||
void onDisconnected();
|
||||
void onNewDownloadState(int progress, const QString &msg);
|
||||
void onAllDownloadsFinished();
|
||||
|
||||
private: // other
|
||||
enum class Mode
|
||||
{
|
||||
PORT_REQUEST,
|
||||
LIST_REQUEST,
|
||||
};
|
||||
|
||||
private: // methods
|
||||
void openWebSocket();
|
||||
|
||||
private: // attributes
|
||||
std::shared_ptr<Interface::Fts> m_fts;
|
||||
std::shared_ptr<WebSocketInterface::WebSocketInterfaceHandler> m_webSocket;
|
||||
|
||||
MainHandler *m_mainHandler;
|
||||
int m_exerciseId;
|
||||
int m_folderId;
|
||||
QString m_operatorName;
|
||||
QString m_hostname;
|
||||
QString m_remoteHostName;
|
||||
int m_currentPort;
|
||||
rti::core::SampleIdentity m_pdfListCookie;
|
||||
rti::core::SampleIdentity m_downloadCookie;
|
||||
rti::core::SampleIdentity m_ocPdfDownloadCookie;
|
||||
PdfDownloadReply m_downloadReply;
|
||||
Core::FunctionReply m_ocPdfDownloadReply;
|
||||
Mode m_currentMode;
|
||||
QVector<WebSocketInterface::Messages::PdfListMessage::PdfInformation> m_pdfData;
|
||||
PdfDownloader *m_downloader;
|
||||
QSqlDatabase m_remoteDbConnection;
|
||||
LOGGER_T &m_logger;
|
||||
};
|
||||
} // namespace OcBaseDownload
|
||||
Reference in new issue
Block a user