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,135 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* MVC view (QTreeView) - shows items (rows), events, date-time lines and more
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, SLSE, 2014-10-01
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "AbstractTimelineModel.h"
|
||||
#include "TimelineIndicator.h"
|
||||
#include "TimelineHeaderView.h"
|
||||
#include "LineMap.h"
|
||||
#include "Range.h"
|
||||
|
||||
#include <QTreeView>
|
||||
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
{
|
||||
/**
|
||||
* @brief MVC view (QTreeView) - shows items (rows), events, date-time lines and more
|
||||
*/
|
||||
class TimelineView : public QTreeView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
/**
|
||||
* @brief creates a specialized QTreeView
|
||||
* @param parent parent of this widget
|
||||
*/
|
||||
explicit TimelineView(QWidget *parent);
|
||||
|
||||
EventGraphic *getEventOnPosition(QPoint position);
|
||||
|
||||
/**
|
||||
* @brief sets the (Timeline-)Model by calling setModel of base class QTreeView with additional options
|
||||
* @param model new TimelineModel
|
||||
*/
|
||||
void setTimelineModel(AbstractTimelineModel *model);
|
||||
|
||||
/**
|
||||
* @brief returns the timeline model
|
||||
* @return timeline model
|
||||
*/
|
||||
AbstractTimelineModel *timelineModel();
|
||||
|
||||
/**
|
||||
* @brief refreshes the view data, which triggers all views to refresh also
|
||||
*/
|
||||
void refreshData();
|
||||
|
||||
/**
|
||||
* @brief setHeader overloaded, does more than the original
|
||||
* @param header header to set
|
||||
*/
|
||||
void setHeader(QHeaderView *header);
|
||||
|
||||
|
||||
void setKnownRanges(const QVector<Range> &newRanges)
|
||||
{
|
||||
m_knownRanges = newRanges;
|
||||
}
|
||||
|
||||
void setDrawCache(bool show)
|
||||
{
|
||||
m_drawCache = show;
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
qint64 m_posMarkTime;
|
||||
AbstractTimelineModel *m_model;
|
||||
LineMap m_lineMap;
|
||||
QVector<Range> m_knownRanges;
|
||||
bool m_drawCache;
|
||||
|
||||
|
||||
protected:
|
||||
bool event(QEvent *event) override;
|
||||
void mouseReleaseEvent(QMouseEvent *) override;
|
||||
void wheelEvent(QWheelEvent *event) override;
|
||||
|
||||
|
||||
/**
|
||||
* @brief checks whether it is possible to start an acecon on the clicked position
|
||||
* @param event event
|
||||
*/
|
||||
//void mouseMoveEvent(QMouseEvent* event);
|
||||
|
||||
/**
|
||||
* @brief draws lines to show where next date texts are
|
||||
* @param event event
|
||||
*/
|
||||
virtual void paintEvent(QPaintEvent *event) override;
|
||||
|
||||
|
||||
public slots:
|
||||
/**
|
||||
* @brief deletes line list (date text line lists)
|
||||
*/
|
||||
void slotResetLineList();
|
||||
|
||||
/**
|
||||
* @brief add date text line pixel position which should be added to a list,
|
||||
* so that the view can draw them on itself
|
||||
* @param posX pixel position of date text line
|
||||
*/
|
||||
void slotAddLine(int posX, qint64 time);
|
||||
|
||||
/**
|
||||
* @brief sets new position mark pixel position to the view (used by mouse click event)
|
||||
* @param posMarkPos pixel position of new position mark
|
||||
*/
|
||||
//void slotSetPosMarkPos(int posMarkPos);
|
||||
|
||||
/**
|
||||
* @brief sets new position mark time position to the view
|
||||
* @param posmarTime time position of new position mark
|
||||
*/
|
||||
void slotSetPosMarkTime(qint64 posMarkTime);
|
||||
|
||||
|
||||
signals:
|
||||
|
||||
void signalEventAction(EventGraphic *eg, int); // int => action type
|
||||
void signalZoom();
|
||||
void signalUnzoom();
|
||||
|
||||
};
|
||||
|
||||
} // namespace LtsTimelineClassic
|
||||
Reference in new issue
Block a user