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,89 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsScriptTimeline/ltsscripttimeline_export.h>
|
||||
#include "track_entry_painters.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QMap>
|
||||
#include <functional>
|
||||
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class TrackWidget;
|
||||
}
|
||||
|
||||
|
||||
namespace LtsScriptTimeline
|
||||
{
|
||||
class TrackEntry;
|
||||
class TrackContentWidget;
|
||||
class FilterTrackWidget;
|
||||
class FilterBackgroundWidget;
|
||||
class ScriptTimeline;
|
||||
class Tools;
|
||||
|
||||
|
||||
class LTSSCRIPTTIMELINE_EXPORT TrackWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit TrackWidget(int baseWidth, bool readonly, Tools *tools, bool filtersAllowed, QWidget *parent = nullptr);
|
||||
~TrackWidget();
|
||||
|
||||
void setReadonly(bool readonly);
|
||||
void updateMe();
|
||||
void unselectAll();
|
||||
bool isSelected() const;
|
||||
QString trackName() const;
|
||||
bool addTrackEntry(TrackEntry *te, bool selectTrackEntry); // use this instead directly on the TCW to get correct filter handling
|
||||
void setTrackName(const QString &name);
|
||||
void addCorrespondingTrackWidget(TrackContentWidget *pCorrespondingTrackWidget);
|
||||
TrackContentWidget *getTrackContentWidget() const;
|
||||
void setBaseWidth(int width);
|
||||
void setIndicatorTime(int time);
|
||||
void selectEntry(int topicId);
|
||||
//void setAllowedTypes(const QVector<TrackEntryType> &allowedTypes);
|
||||
void setInternalName(const QString &name);
|
||||
QVector<TrackEntry *> getTrackEntriesFiltersAsEntries(bool selectedEntriesOnly = false) const; // filters as entries
|
||||
QVector<TrackEntry *> getTrackEntriesWithFilters(bool selectedEntriesOnly = false) const; // filters inside parent's detail data
|
||||
QVector<TrackEntry *> getTrackEntries(bool selectedEntriesOnly = false) const; // no filters
|
||||
QVector<TrackEntry *> getSelectedFilterEntries() const;
|
||||
const QVector<TrackEntry *> &getSelectedEntries() const;
|
||||
int getParentTopicIdOfFilter(const TrackEntry *te) const;
|
||||
void setScriptTimeline(ScriptTimeline *scriptTimeline);
|
||||
const QVector<FilterTrackWidget *> &filterLines() const { return m_filterLines; }
|
||||
|
||||
void keyPressEvent(QKeyEvent *event) override; // TODO: private..
|
||||
|
||||
private:
|
||||
QVector<FilterTrackWidget *> m_filterLines;
|
||||
Ui::TrackWidget *ui;
|
||||
int m_baseWidth;
|
||||
QString m_internalName;
|
||||
bool m_readonly;
|
||||
ScriptTimeline *m_scriptTimeline;
|
||||
Tools *m_tools;
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
|
||||
private slots:
|
||||
void slotExpand();
|
||||
void slotTrackEntryAdded(TrackEntry *te);
|
||||
void slotTrackEntryDeleted(const int topicId);
|
||||
void slotMainChangesMade();
|
||||
void slotAddFilter();
|
||||
|
||||
signals:
|
||||
void signalUnselectAll(); // redirected to ScriptTimeline
|
||||
void signalSelectTrack(); // checkbox un-/selected
|
||||
void signalTrackEntrySelectionChanged(TrackEntry *te); // durchgereicht!
|
||||
void signalChangesMade();
|
||||
void signalEditEntry(const int topicId);
|
||||
void signalTrackEntryDeleted(const int topicId);
|
||||
void signalTrackEntryAdded(TrackEntry *te);
|
||||
};
|
||||
|
||||
} // namespace LtsScriptTimeline
|
||||
Reference in new issue
Block a user