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,126 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* some models for LogViewGui
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "LogViewTelegram.hpp"
|
||||
#include <QModelIndex>
|
||||
|
||||
class QAction;
|
||||
class QTableView;
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
class LogViewInjectionThread;
|
||||
class TelegramEditModel;
|
||||
|
||||
class TelegramEdit :public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit TelegramEdit(QWidget *parent = nullptr);
|
||||
|
||||
QTableView *tableView() { return m_tableView; }
|
||||
|
||||
void appendTelegram(const QSharedPointer<LogViewTelegram> &telegram);
|
||||
|
||||
void setInjectionThread(LogViewInjectionThread* a_injectionThread);
|
||||
|
||||
bool isInjectionPossible() const;
|
||||
|
||||
protected:
|
||||
QSharedPointer<LogViewTelegram> m_copyTelegram;
|
||||
|
||||
QSharedPointer<LogViewTelegram> currentSelectedTelegram() const;
|
||||
|
||||
QModelIndex currentSelectedIndex() const;
|
||||
|
||||
QSharedPointer<LogViewTelegram> telegramAtRow(int row);
|
||||
|
||||
void loadTelegramList(bool checkAppend);
|
||||
|
||||
protected:
|
||||
QAction *m_addTeleAction;
|
||||
QAction *m_editTeleAction;
|
||||
QAction *m_copyTeleAction;
|
||||
QAction *m_pasteTeleAction;
|
||||
QAction *m_deleteTeleAction;
|
||||
QAction *m_moveTeleUpAction;
|
||||
QAction *m_moveTeleDownAction;
|
||||
QAction *m_teleListLoad;
|
||||
QAction *m_teleListAppend;
|
||||
QAction *m_teleListSave;
|
||||
QTableView *m_tableView;
|
||||
bool m_DoLoop;
|
||||
|
||||
LogViewInjectionThread *m_InjectionThread;
|
||||
|
||||
int m_currentRowToSend;
|
||||
|
||||
int m_curEditTelegramRow;
|
||||
|
||||
TelegramEditModel *m_EditModel;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
static QString s_DIR();
|
||||
static QString s_EDIT_TELEGRAM_GROUP();
|
||||
static QString s_TELEGRAMLIST_FILE_ID();
|
||||
static QString s_TELEGRAMLIST_FILES();
|
||||
|
||||
protected Q_SLOTS:
|
||||
|
||||
void addTelegram();
|
||||
|
||||
void injectTelegram(bool a_bAsCentralTelegram);
|
||||
|
||||
void injectTelegram(const QSharedPointer<LogViewTelegram> &a_telegram, bool a_bAsCentralTelegram);
|
||||
|
||||
void sendTelegram(const QSharedPointer<LogViewTelegram> &a_telegram);
|
||||
|
||||
void sendCurrentTelegram();
|
||||
|
||||
void tableViewCustomContextMenu(const QPoint &pos);
|
||||
|
||||
void editTelegram();
|
||||
|
||||
void showTelegram();
|
||||
|
||||
void deleteTelegram();
|
||||
|
||||
void injectCentralTelegram();
|
||||
|
||||
void injectTetraTelegram();
|
||||
|
||||
void loopTelegrams();
|
||||
|
||||
void loopNextTelegram();
|
||||
|
||||
void sequenceTelegrams();
|
||||
|
||||
void sequenceNextTelegram();
|
||||
|
||||
void copy();
|
||||
|
||||
void paste();
|
||||
|
||||
void moveUp();
|
||||
|
||||
void moveDown();
|
||||
|
||||
void saveTelegramList();
|
||||
|
||||
void loadTelegramListAppend();
|
||||
|
||||
void loadTelegramListReplace();
|
||||
|
||||
void editTelegramDialogFinished();
|
||||
|
||||
void onSelectionChanged();
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user