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,127 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* ABC for creating custom views of dds sequences
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Jens Heilmann, SLTE, 2021-05-17
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef Q_MOC_RUN
|
||||
#include <dds/dds.hpp>
|
||||
#endif
|
||||
|
||||
#include <QGroupBox>
|
||||
#include <QList>
|
||||
|
||||
#include <detailview.h>
|
||||
#include "logger.h"
|
||||
|
||||
class QToolButton;
|
||||
|
||||
class AbstractSequenceWidget : public QGroupBox
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
/**
|
||||
* @brief AbstractSequenceWidget inits pbAddMember and adds logic to it.
|
||||
* @attention pbAddMember must be inserted into a layout
|
||||
* @param readOnly if read only, disable all buttons on creation
|
||||
* @param name
|
||||
* @param contentType
|
||||
* @param logger
|
||||
* @param parent
|
||||
*/
|
||||
explicit AbstractSequenceWidget(const RwMode &readOnly,
|
||||
const QString &name,
|
||||
const dds::core::xtypes::DynamicType &contentType,
|
||||
NGL::INGLLogger &logger,
|
||||
QWidget *parent = nullptr);
|
||||
|
||||
~AbstractSequenceWidget();
|
||||
|
||||
/**
|
||||
* @brief setValue set data from dds for widget at index
|
||||
* if widget not found, createa a new one
|
||||
* @param inner
|
||||
* @param index
|
||||
* @param useOn
|
||||
*/
|
||||
virtual void setValue(const dds::core::xtypes::DynamicData &inner,
|
||||
const uint32_t &index, const QWidget *useOn);
|
||||
|
||||
/**
|
||||
* @brief getValue get data inside widget for dds
|
||||
* @param name
|
||||
* @param data
|
||||
* @param index
|
||||
* @param useOn
|
||||
*/
|
||||
virtual void getValue(const QString &name, dds::core::xtypes::DynamicData &data,
|
||||
const uint32_t &index, const QWidget *useOn) const;
|
||||
|
||||
/**
|
||||
* @brief setMemberCount used by DetailView
|
||||
* @param count
|
||||
*/
|
||||
virtual void setMemberCount(int count);
|
||||
|
||||
/**
|
||||
* @brief getMemberCount used by DetailView
|
||||
* @return
|
||||
*/
|
||||
virtual uint32_t getMemberCount() const;
|
||||
|
||||
protected:
|
||||
/**
|
||||
* @brief logger
|
||||
* @return
|
||||
*/
|
||||
virtual NGL::INGLLogger &logger() const;
|
||||
|
||||
/**
|
||||
* @brief pbAddMember
|
||||
* @return
|
||||
*/
|
||||
virtual QToolButton *pbAddMember() const;
|
||||
|
||||
/**
|
||||
* @brief getObjectName generates a valid object name given by index
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
virtual QString getObjectName(int index) const;
|
||||
|
||||
/**
|
||||
* @brief setupMemberWidget place child and button widget into a layout
|
||||
* @param child
|
||||
* @param pbChild
|
||||
* @param objectName
|
||||
*/
|
||||
virtual void setupMemberWidget(QWidget *child, QToolButton *pbChild, const QString &objectName) = 0;
|
||||
|
||||
private slots:
|
||||
/**
|
||||
* @brief addMemberWidget create a new button and connect to child
|
||||
* @param member new child
|
||||
*/
|
||||
virtual void addMemberWidget(QWidget *member);
|
||||
|
||||
/**
|
||||
* @brief deleteMemberWidget clean up child and reindex other children objectnames
|
||||
* @param member deleted child
|
||||
*/
|
||||
virtual void deleteMemberWidget(QObject *member);
|
||||
|
||||
private:
|
||||
RwMode m_rwMode;
|
||||
QToolButton *m_pbAddMember = nullptr;
|
||||
QList<QWidget*> m_memberList;
|
||||
dds::core::xtypes::DynamicType m_contentType;
|
||||
QString m_name;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user