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,75 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Display Panel Simulator widget; manages the LED-lines and servers
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Florian Schult, SLSE, 2016-03-18
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
//===Include specifications==================================================
|
||||
#include "customMapsAndEnum.h"
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QVector>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class DisplayPanelSimulatorWidget;
|
||||
}
|
||||
|
||||
class DisplayPanelSimulatorTcpServer;
|
||||
class QLedLine;
|
||||
class DebugMessages;
|
||||
class QLabel;
|
||||
class QImage;
|
||||
class QSize;
|
||||
|
||||
|
||||
class DisplayPanelSimulatorWidget : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DisplayPanelSimulatorWidget(/*QWidget *parent = nullptr*/);
|
||||
~DisplayPanelSimulatorWidget();
|
||||
static DisplayPanelSimulatorWidget *self();
|
||||
int initialize(const QString &mode_, const QVector<int> &ports, bool fullscreen, bool showPort, const QString &imagePath);
|
||||
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent *event);
|
||||
virtual void closeEvent(QCloseEvent *event);
|
||||
virtual void keyPressEvent(QKeyEvent *e);
|
||||
|
||||
|
||||
public slots:
|
||||
void onDebugInfosAction();
|
||||
void onFullscreenAction(bool fullscreen);
|
||||
|
||||
private Q_SLOTS:
|
||||
void writeMultiLiners(const QString &string);
|
||||
void onErrorMsg(int port, const QString &string, MsgLvl lvl);
|
||||
void onExitAction();
|
||||
void onSaveSettingsAction();
|
||||
|
||||
|
||||
private:
|
||||
static QString findFullMode(const QString &stubMode, const ModeMap &map);
|
||||
void scaleImage(QImage &image);
|
||||
|
||||
|
||||
QVector<DisplayPanelSimulatorTcpServer *> m_servers;
|
||||
Ui::DisplayPanelSimulatorWidget *m_ui;
|
||||
PortMap m_ports;
|
||||
QVector<QLedLine *> m_ledLines;
|
||||
Mode m_mode;
|
||||
QString m_message;
|
||||
DebugMessages *m_debugMessages;
|
||||
QLabel *m_statusLabel;
|
||||
NGL::INGLLogger &m_logger;
|
||||
QSize m_charSize;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user