qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing override 

Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
This commit is contained in:
Alexander Volkov 2020-06-26 17:47:24 +03:00
parent 09e937788d
commit 14684346ef
36 changed files with 200 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/datavisualization/axis/qcategory3daxis_p.h
View File

@ -56,9 +56,9 @@ public:
void setDataLabels(const QStringList &labels);
protected:
virtual bool allowZero();
virtual bool allowNegatives();
virtual bool allowMinMaxSame();
bool allowZero() override;
bool allowNegatives() override;
bool allowMinMaxSame() override;
private:
QCategory3DAxis *qptr();

10
src/datavisualization/axis/qlogvalue3daxisformatter.h
View File

@ -63,11 +63,11 @@ Q_SIGNALS:
void showEdgeLabelsChanged(bool enabled);
protected:
virtual QValue3DAxisFormatter *createNewInstance() const;
virtual void recalculate();
virtual float positionAt(float value) const;
virtual float valueAt(float position) const;
virtual void populateCopy(QValue3DAxisFormatter &copy) const;
QValue3DAxisFormatter *createNewInstance() const override;
void recalculate() override;
float positionAt(float value) const override;
float valueAt(float position) const override;
void populateCopy(QValue3DAxisFormatter &copy) const override;
QLogValue3DAxisFormatterPrivate *dptr();
const QLogValue3DAxisFormatterPrivate *dptrc() const;

14
src/datavisualization/axis/qvalue3daxis_p.h
View File

@ -53,9 +53,9 @@ public:
QValue3DAxisPrivate(QValue3DAxis *q);
virtual ~QValue3DAxisPrivate();
virtual void setRange(float min, float max, bool suppressWarnings = false);
virtual void setMin(float min);
virtual void setMax (float max);
void setRange(float min, float max, bool suppressWarnings = false) override;
void setMin(float min) override;
void setMax (float max) override;
void emitLabelsChanged();
@ -63,11 +63,11 @@ Q_SIGNALS:
void formatterDirty();
protected:
virtual void updateLabels();
void updateLabels() override;
virtual bool allowZero();
virtual bool allowNegatives();
virtual bool allowMinMaxSame();
bool allowZero() override;
bool allowNegatives() override;
bool allowMinMaxSame() override;
int m_segmentCount;
int m_subSegmentCount;

6
src/datavisualization/data/baritemmodelhandler_p.h
View File

@ -53,11 +53,11 @@ public:
virtual ~BarItemModelHandler();
public Q_SLOTS:
virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QList<int> &roles = QList<int>());
void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QList<int> &roles = QList<int>()) override;
protected:
void virtual resolveModel();
void resolveModel() override;
QItemModelBarDataProxy *m_proxy; // Not owned
QBarDataArray *m_proxyArray; // Not owned

6
src/datavisualization/data/qbar3dseries_p.h
View File

@ -52,9 +52,9 @@ public:
QBar3DSeriesPrivate(QBar3DSeries *q);
virtual ~QBar3DSeriesPrivate();
virtual void setDataProxy(QAbstractDataProxy *proxy);
virtual void connectControllerAndProxy(Abstract3DController *newController);
virtual void createItemLabel();
void setDataProxy(QAbstractDataProxy *proxy) override;
void connectControllerAndProxy(Abstract3DController *newController) override;
void createItemLabel() override;
void handleMeshRotationChanged(const QQuaternion &rotation);

2
src/datavisualization/data/qbardataproxy_p.h
View File

@ -66,7 +66,7 @@ public:
QPair<GLfloat, GLfloat> limitValues(int startRow, int startColumn, int rowCount,
int columnCount) const;
virtual void setSeries(QAbstract3DSeries *series);
void setSeries(QAbstract3DSeries *series) override;
private:
QBarDataProxy *qptr();

6
src/datavisualization/data/qscatter3dseries_p.h
View File

@ -52,9 +52,9 @@ public:
QScatter3DSeriesPrivate(QScatter3DSeries *q);
virtual ~QScatter3DSeriesPrivate();
virtual void setDataProxy(QAbstractDataProxy *proxy);
virtual void connectControllerAndProxy(Abstract3DController *newController);
virtual void createItemLabel();
void setDataProxy(QAbstractDataProxy *proxy) override;
void connectControllerAndProxy(Abstract3DController *newController) override;
void createItemLabel() override;
void setSelectedItem(int index);
void setItemSize(float size);

2
src/datavisualization/data/qscatterdataproxy_p.h
View File

@ -67,7 +67,7 @@ public:
QAbstract3DAxis *axisY, QAbstract3DAxis *axisZ) const;
bool isValidValue(float axisValue, float value, QAbstract3DAxis *axis) const;
virtual void setSeries(QAbstract3DSeries *series);
void setSeries(QAbstract3DSeries *series) override;
private:
QScatterDataProxy *qptr();
QScatterDataArray *m_dataArray;

6
src/datavisualization/data/qsurface3dseries_p.h
View File

@ -52,9 +52,9 @@ public:
QSurface3DSeriesPrivate(QSurface3DSeries *q);
virtual ~QSurface3DSeriesPrivate();
virtual void setDataProxy(QAbstractDataProxy *proxy);
virtual void connectControllerAndProxy(Abstract3DController *newController);
virtual void createItemLabel();
void setDataProxy(QAbstractDataProxy *proxy) override;
void connectControllerAndProxy(Abstract3DController *newController) override;
void createItemLabel() override;
void setSelectedPoint(const QPoint &position);
void setFlatShadingEnabled(bool enabled);

2
src/datavisualization/data/qsurfacedataproxy_p.h
View File

@ -67,7 +67,7 @@ public:
QAbstract3DAxis *axisY, QAbstract3DAxis *axisZ) const;
bool isValidValue(float value, QAbstract3DAxis *axis) const;
virtual void setSeries(QAbstract3DSeries *series);
void setSeries(QAbstract3DSeries *series) override;
protected:
QSurfaceDataArray *m_dataArray;

10
src/datavisualization/data/scatteritemmodelhandler_p.h
View File

@ -53,13 +53,13 @@ public:
virtual ~ScatterItemModelHandler();
public Q_SLOTS:
virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QList<int> &roles = QList<int>());
virtual void handleRowsInserted(const QModelIndex &parent, int start, int end);
virtual void handleRowsRemoved(const QModelIndex &parent, int start, int end);
void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QList<int> &roles = QList<int>()) override;
void handleRowsInserted(const QModelIndex &parent, int start, int end) override;
void handleRowsRemoved(const QModelIndex &parent, int start, int end) override;
protected:
void virtual resolveModel();
void resolveModel() override;
private:
void modelPosToScatterItem(int modelRow, int modelColumn, QScatterDataItem &item);

6
src/datavisualization/data/surfaceitemmodelhandler_p.h
View File

@ -53,11 +53,11 @@ public:
virtual ~SurfaceItemModelHandler();
public Q_SLOTS:
virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QList<int> &roles = QList<int>());
void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
const QList<int> &roles = QList<int>()) override;
protected:
void virtual resolveModel();
void resolveModel() override;
QItemModelSurfaceDataProxy *m_proxy; // Not owned
QSurfaceDataArray *m_proxyArray; // Not owned

32
src/datavisualization/engine/bars3dcontroller_p.h
View File

@ -106,8 +106,8 @@ public:
explicit Bars3DController(QRect rect, Q3DScene *scene = 0);
~Bars3DController();
virtual void initializeOpenGL();
virtual void synchDataToRenderer();
void initializeOpenGL() override;
void synchDataToRenderer() override;
void setMultiSeriesScaling(bool uniform);
bool multiSeriesScaling() const;
@ -126,29 +126,29 @@ public:
inline QBar3DSeries *selectedSeries() const { return m_selectedBarSeries; }
void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
void setSelectionMode(QAbstract3DGraph::SelectionFlags mode) override;
void setSelectedBar(const QPoint &position, QBar3DSeries *series, bool enterSlice);
virtual void clearSelection();
void clearSelection() override;
virtual void handleAxisAutoAdjustRangeChangedInOrientation(
QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
virtual void handlePendingClick();
void handleAxisAutoAdjustRangeChangedInOrientation(
QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) override;
void handleSeriesVisibilityChangedBySender(QObject *sender) override;
void handlePendingClick() override;
static QPoint invalidSelectionPosition();
virtual void setAxisX(QAbstract3DAxis *axis);
virtual void setAxisZ(QAbstract3DAxis *axis);
void setAxisX(QAbstract3DAxis *axis) override;
void setAxisZ(QAbstract3DAxis *axis) override;
virtual void setPrimarySeries(QBar3DSeries *series);
virtual QBar3DSeries *primarySeries() const;
virtual void addSeries(QAbstract3DSeries *series);
virtual void removeSeries(QAbstract3DSeries *series);
virtual void insertSeries(int index, QAbstract3DSeries *series);
void addSeries(QAbstract3DSeries *series) override;
void removeSeries(QAbstract3DSeries *series) override;
void insertSeries(int index, QAbstract3DSeries *series) override;
virtual QList<QBar3DSeries *> barSeriesList();
virtual void handleAxisRangeChangedBySender(QObject *sender);
virtual void adjustAxisRanges();
void handleAxisRangeChangedBySender(QObject *sender) override;
void adjustAxisRanges() override;
public Q_SLOTS:
void handleArrayReset();
@ -165,7 +165,7 @@ Q_SIGNALS:
void selectedSeriesChanged(QBar3DSeries *series);
protected:
virtual QAbstract3DAxis *createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation);
QAbstract3DAxis *createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation) override;
private:
void adjustSelectionPosition(QPoint &pos, const QBar3DSeries *series);

48
src/datavisualization/engine/bars3drenderer_p.h
View File

@ -119,25 +119,25 @@ public:
explicit Bars3DRenderer(Bars3DController *controller);
~Bars3DRenderer();
void updateData();
void updateSeries(const QList<QAbstract3DSeries *> &seriesList);
SeriesRenderCache *createNewCache(QAbstract3DSeries *series);
void updateData() override;
void updateSeries(const QList<QAbstract3DSeries *> &seriesList) override;
SeriesRenderCache *createNewCache(QAbstract3DSeries *series) override;
void updateRows(const QList<Bars3DController::ChangeRow> &rows);
void updateItems(const QList<Bars3DController::ChangeItem> &items);
void updateScene(Q3DScene *scene);
void render(GLuint defaultFboHandle = 0);
void updateScene(Q3DScene *scene) override;
void render(GLuint defaultFboHandle = 0) override;
QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute);
QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute) override;
void updateAspectRatio(float ratio);
void updateAspectRatio(float ratio) override;
void updateFloorLevel(float level);
void updateMargin(float margin);
void updateMargin(float margin) override;
protected:
void contextCleanup();
virtual void initializeOpenGL();
virtual void fixCameraTarget(QVector3D &target);
virtual void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds);
void contextCleanup() override;
void initializeOpenGL() override;
void fixCameraTarget(QVector3D &target) override;
void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds) override;
public Q_SLOTS:
void updateMultiSeriesScaling(bool uniform);
@ -150,17 +150,17 @@ public Q_SLOTS:
void resetClickedStatus();
// Overloaded from abstract renderer
virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min,
float max);
virtual void updateAxisReversed(QAbstract3DAxis::AxisOrientation orientation,
bool enable);
void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min,
float max) override;
void updateAxisReversed(QAbstract3DAxis::AxisOrientation orientation,
bool enable) override;
private:
virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
virtual void updateTextures();
virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
void initShaders(const QString &vertexShader, const QString &fragmentShader) override;
void initGradientShaders(const QString &vertexShader, const QString &fragmentShader) override;
void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality) override;
void updateTextures() override;
void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh) override;
void drawSlicedScene();
void drawScene(GLuint defaultFboHandle);
@ -180,10 +180,10 @@ private:
void loadBackgroundMesh();
void initSelectionShader();
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader);
void initSelectionBuffer();
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) override;
void initSelectionBuffer() override;
void initDepthShader();
void updateDepthBuffer();
void updateDepthBuffer() override;
void calculateSceneScalingFactors();
void calculateHeightAdjustment();
Abstract3DController::SelectionType isSelected(int row, int bar,

2
src/datavisualization/engine/barseriesrendercache_p.h
View File

@ -53,7 +53,7 @@ public:
BarSeriesRenderCache(QAbstract3DSeries *series, Abstract3DRenderer *renderer);
virtual ~BarSeriesRenderCache();
void cleanup(TextureHelper *texHelper);
void cleanup(TextureHelper *texHelper) override;
inline BarRenderItemArray &renderArray() { return m_renderArray; }
inline QBar3DSeries *series() const { return static_cast<QBar3DSeries *>(m_series); }

6
src/datavisualization/engine/q3dbars_p.h
View File

@ -54,9 +54,9 @@ public:
Q3DBarsPrivate(Q3DBars *q);
~Q3DBarsPrivate();
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q3DBars *qptr();

2
src/datavisualization/engine/q3dcamera.h
View File

@ -93,7 +93,7 @@ public:
bool wrapYRotation() const;
void setWrapYRotation(bool isEnabled);
virtual void copyValuesFrom(const Q3DObject &source);
void copyValuesFrom(const Q3DObject &source) override;
CameraPreset cameraPreset() const;
void setCameraPreset(CameraPreset preset);

6
src/datavisualization/engine/q3dscatter_p.h
View File

@ -54,9 +54,9 @@ public:
Q3DScatterPrivate(Q3DScatter *q);
~Q3DScatterPrivate();
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q3DScatter *qptr();

6
src/datavisualization/engine/q3dsurface_p.h
View File

@ -54,9 +54,9 @@ public:
Q3DSurfacePrivate(Q3DSurface *q);
~Q3DSurfacePrivate();
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q3DSurface *qptr();

18
src/datavisualization/engine/qabstract3dgraph.h
View File

@ -197,17 +197,17 @@ public:
bool hasContext() const;
protected:
bool event(QEvent *event);
void resizeEvent(QResizeEvent *event);
void exposeEvent(QExposeEvent *event);
bool event(QEvent *event) override;
void resizeEvent(QResizeEvent *event) override;
void exposeEvent(QExposeEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event);
void touchEvent(QTouchEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mouseDoubleClickEvent(QMouseEvent *event) override;
void touchEvent(QTouchEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
#if QT_CONFIG(wheelevent)
void wheelEvent(QWheelEvent *event);
void wheelEvent(QWheelEvent *event) override;
#endif
Q_SIGNALS:

24
src/datavisualization/engine/scatter3dcontroller_p.h
View File

@ -107,28 +107,28 @@ public:
explicit Scatter3DController(QRect rect, Q3DScene *scene = 0);
~Scatter3DController();
virtual void initializeOpenGL();
void initializeOpenGL() override;
// Change selection mode
void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
void setSelectionMode(QAbstract3DGraph::SelectionFlags mode) override;
inline QScatter3DSeries *selectedSeries() const { return m_selectedItemSeries; }
void setSelectedItem(int index, QScatter3DSeries *series);
static inline int invalidSelectionIndex() { return -1; }
virtual void clearSelection();
void clearSelection() override;
void synchDataToRenderer();
void synchDataToRenderer() override;
virtual void addSeries(QAbstract3DSeries *series);
virtual void removeSeries(QAbstract3DSeries *series);
void addSeries(QAbstract3DSeries *series) override;
void removeSeries(QAbstract3DSeries *series) override;
virtual QList<QScatter3DSeries *> scatterSeriesList();
virtual void handleAxisAutoAdjustRangeChangedInOrientation(
QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
virtual void handleAxisRangeChangedBySender(QObject *sender);
virtual void handlePendingClick();
virtual void adjustAxisRanges();
void handleAxisAutoAdjustRangeChangedInOrientation(
QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) override;
void handleAxisRangeChangedBySender(QObject *sender) override;
void handlePendingClick() override;
void adjustAxisRanges() override;
public Q_SLOTS:
void handleArrayReset();
@ -141,7 +141,7 @@ Q_SIGNALS:
void selectedSeriesChanged(QScatter3DSeries *series);
protected:
virtual void startRecordingRemovesAndInserts();
void startRecordingRemovesAndInserts() override;
private:

52
src/datavisualization/engine/scatter3drenderer_p.h
View File

@ -97,44 +97,44 @@ public:
explicit Scatter3DRenderer(Scatter3DController *controller);
~Scatter3DRenderer();
void updateData();
void updateSeries(const QList<QAbstract3DSeries *> &seriesList);
SeriesRenderCache *createNewCache(QAbstract3DSeries *series);
void updateData() override;
void updateSeries(const QList<QAbstract3DSeries *> &seriesList) override;
SeriesRenderCache *createNewCache(QAbstract3DSeries *series) override;
void updateItems(const QList<Scatter3DController::ChangeItem> &items);
void updateScene(Q3DScene *scene);
void updateScene(Q3DScene *scene) override;
void updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation,
const QStringList &labels);
const QStringList &labels) override;
void updateAxisTitleVisibility(QAbstract3DAxis::AxisOrientation orientation,
bool visible);
void updateOptimizationHint(QAbstract3DGraph::OptimizationHints hint);
void updateMargin(float margin);
bool visible) override;
void updateOptimizationHint(QAbstract3DGraph::OptimizationHints hint) override;
void updateMargin(float margin) override;
QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute);
QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute) override;
inline int clickedIndex() const { return m_clickedIndex; }
void resetClickedStatus();
void render(GLuint defaultFboHandle);
void render(GLuint defaultFboHandle) override;
public Q_SLOTS:
void updateSelectedItem(int index, QScatter3DSeries *series);
protected:
void contextCleanup();
virtual void initializeOpenGL();
virtual void fixCameraTarget(QVector3D &target);
virtual void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds);
void contextCleanup() override;
void initializeOpenGL() override;
void fixCameraTarget(QVector3D &target) override;
void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds) override;
private:
virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void initStaticSelectedItemShaders(const QString &vertexShader,
const QString &fragmentShader,
const QString &gradientVertexShader,
const QString &gradientFragmentShader);
virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
virtual void updateTextures();
virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
void initShaders(const QString &vertexShader, const QString &fragmentShader) override;
void initGradientShaders(const QString &vertexShader, const QString &fragmentShader) override;
void initStaticSelectedItemShaders(const QString &vertexShader,
const QString &fragmentShader,
const QString &gradientVertexShader,
const QString &gradientFragmentShader) override;
void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality) override;
void updateTextures() override;
void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh) override;
void drawScene(GLuint defaultFboHandle);
void drawLabels(bool drawSelection, const Q3DCamera *activeCamera,
@ -142,11 +142,11 @@ private:
void loadBackgroundMesh();
void initSelectionShader();
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader);
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) override;
void initStaticPointShaders(const QString &vertexShader, const QString &fragmentShader);
void initSelectionBuffer();
void initSelectionBuffer() override;
void initDepthShader();
void updateDepthBuffer();
void updateDepthBuffer() override;
void initPointShader();
void calculateTranslation(ScatterRenderItem &item);
void calculateSceneScalingFactors();

2
src/datavisualization/engine/scatterseriesrendercache_p.h
View File

@ -56,7 +56,7 @@ public:
ScatterSeriesRenderCache(QAbstract3DSeries *series, Abstract3DRenderer *renderer);
virtual ~ScatterSeriesRenderCache();
void cleanup(TextureHelper *texHelper);
void cleanup(TextureHelper *texHelper) override;
inline ScatterRenderItemArray &renderArray() { return m_renderArray; }
inline QScatter3DSeries *series() const { return static_cast<QScatter3DSeries *>(m_series); }

24
src/datavisualization/engine/surface3dcontroller_p.h
View File

@ -95,27 +95,27 @@ public:
explicit Surface3DController(QRect rect, Q3DScene *scene = 0);
~Surface3DController();
virtual void initializeOpenGL();
virtual void synchDataToRenderer();
void initializeOpenGL() override;
void synchDataToRenderer() override;
void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
void setSelectionMode(QAbstract3DGraph::SelectionFlags mode) override;
void setSelectedPoint(const QPoint &position, QSurface3DSeries *series, bool enterSlice);
virtual void clearSelection();
void clearSelection() override;
inline QSurface3DSeries *selectedSeries() const { return m_selectedSeries; }
virtual void handleAxisAutoAdjustRangeChangedInOrientation(
QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
virtual void handleAxisRangeChangedBySender(QObject *sender);
virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
virtual void handlePendingClick();
virtual void adjustAxisRanges();
void handleAxisAutoAdjustRangeChangedInOrientation(
QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) override;
void handleAxisRangeChangedBySender(QObject *sender) override;
void handleSeriesVisibilityChangedBySender(QObject *sender) override;
void handlePendingClick() override;
void adjustAxisRanges() override;
static QPoint invalidSelectionPosition();
bool isFlatShadingSupported();
virtual void addSeries(QAbstract3DSeries *series);
virtual void removeSeries(QAbstract3DSeries *series);
void addSeries(QAbstract3DSeries *series) override;
void removeSeries(QAbstract3DSeries *series) override;
virtual QList<QSurface3DSeries *> surfaceSeriesList();
void setFlipHorizontalGrid(bool flip);

42
src/datavisualization/engine/surface3drenderer_p.h
View File

@ -92,34 +92,34 @@ public:
explicit Surface3DRenderer(Surface3DController *controller);
~Surface3DRenderer();
void updateData();
void updateSeries(const QList<QAbstract3DSeries *> &seriesList);
void updateData() override;
void updateSeries(const QList<QAbstract3DSeries *> &seriesList) override;
void updateSurfaceTextures(QList<QSurface3DSeries *> seriesList);
SeriesRenderCache *createNewCache(QAbstract3DSeries *series);
void cleanCache(SeriesRenderCache *cache);
void updateSelectionMode(QAbstract3DGraph::SelectionFlags mode);
SeriesRenderCache *createNewCache(QAbstract3DSeries *series) override;
void cleanCache(SeriesRenderCache *cache) override;
void updateSelectionMode(QAbstract3DGraph::SelectionFlags mode) override;
void updateRows(const QList<Surface3DController::ChangeRow> &rows);
void updateItems(const QList<Surface3DController::ChangeItem> &points);
void updateScene(Q3DScene *scene);
void updateScene(Q3DScene *scene) override;
void updateSlicingActive(bool isSlicing);
void updateSelectedPoint(const QPoint &position, QSurface3DSeries *series);
void updateFlipHorizontalGrid(bool flip);
inline QPoint clickedPosition() const { return m_clickedPosition; }
void resetClickedStatus();
QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute);
QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute) override;
void updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation,
const QStringList &labels);
const QStringList &labels) override;
void updateAxisTitleVisibility(QAbstract3DAxis::AxisOrientation orientation,
bool visible);
void updateMargin(float margin);
bool visible) override;
void updateMargin(float margin) override;
void render(GLuint defaultFboHandle = 0);
void render(GLuint defaultFboHandle = 0) override;
protected:
void contextCleanup();
void initializeOpenGL();
virtual void fixCameraTarget(QVector3D &target);
virtual void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds);
void contextCleanup() override;
void initializeOpenGL() override;
virtual void fixCameraTarget(QVector3D &target) override;
virtual void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds) override;
Q_SIGNALS:
void flatShadingSupportedChanged(bool supported);
@ -132,9 +132,9 @@ private:
void findMatchingRow(float z, int &sample, int direction, QSurfaceDataArray &dataArray);
void findMatchingColumn(float x, int &sample, int direction, QSurfaceDataArray &dataArray);
void updateSliceObject(SurfaceSeriesRenderCache *cache, const QPoint &point);
void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
void updateTextures();
void initShaders(const QString &vertexShader, const QString &fragmentShader);
void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality) override;
void updateTextures() override;
void initShaders(const QString &vertexShader, const QString &fragmentShader) override;
QRect calculateSampleRect(const QSurfaceDataArray &array);
void loadBackgroundMesh();
@ -144,10 +144,10 @@ private:
const QMatrix4x4 &viewMatrix, const QMatrix4x4 &projectionMatrix);
void calculateSceneScalingFactors();
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader);
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) override;
void initSelectionShaders();
void initSurfaceShaders();
void initSelectionBuffer();
void initSelectionBuffer() override;
void initDepthShader();
void updateSelectionTextures();
void createSelectionTexture(SurfaceSeriesRenderCache *cache, uint &lastSelectionId);
@ -156,7 +156,7 @@ private:
void surfacePointSelected(const QPoint &point);
void updateSelectionPoint(SurfaceSeriesRenderCache *cache, const QPoint &point, bool label);
QPoint selectionIdToSurfacePoint(uint id);
void updateDepthBuffer();
void updateDepthBuffer() override;
void emitSelectedPointChanged(QPoint position);
Q_DISABLE_COPY(Surface3DRenderer)

4
src/datavisualization/engine/surfaceseriesrendercache_p.h
View File

@ -58,8 +58,8 @@ public:
SurfaceSeriesRenderCache(QAbstract3DSeries *series, Surface3DRenderer *renderer);
virtual ~SurfaceSeriesRenderCache();
virtual void populate(bool newSeries);
virtual void cleanup(TextureHelper *texHelper);
void populate(bool newSeries) override;
void cleanup(TextureHelper *texHelper) override;
inline bool surfaceVisible() const { return m_surfaceVisible; }
inline bool surfaceGridVisible() const { return m_surfaceGridVisible; }

8
src/datavisualization/input/q3dinputhandler.h
View File

@ -58,11 +58,11 @@ public:
bool isZoomAtTargetEnabled() const;
// Input event listeners
virtual void mousePressEvent(QMouseEvent *event, const QPoint &mousePos);
virtual void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos);
virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos);
void mousePressEvent(QMouseEvent *event, const QPoint &mousePos) override;
void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos) override;
void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) override;
#if QT_CONFIG(wheelevent)
virtual void wheelEvent(QWheelEvent *event);
void wheelEvent(QWheelEvent *event) override;
#endif
Q_SIGNALS:

2
src/datavisualization/input/qtouch3dinputhandler.h
View File

@ -45,7 +45,7 @@ public:
virtual ~QTouch3DInputHandler();
// Input event listeners
virtual void touchEvent(QTouchEvent *event);
void touchEvent(QTouchEvent *event) override;
private:
Q_DISABLE_COPY(QTouch3DInputHandler)

2
src/datavisualization/utils/surfaceobject_p.h
View File

@ -88,7 +88,7 @@ public:
void createCoarseGridlineIndices(int x, int y, int endX, int endY);
void uploadBuffers();
GLuint gridElementBuf();
GLuint uvBuf();
GLuint uvBuf() override;
GLuint gridIndexCount();
QVector3D vertexAt(int column, int row);
void clear();

18
src/datavisualizationqml2/abstractdeclarative_p.h
View File

@ -181,7 +181,7 @@ public:
static QCustom3DItem *atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list, int index);
static void clearCustomItemFunc(QQmlListProperty<QCustom3DItem> *list);
virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
void setSharedController(Abstract3DController *controller);
// Used to synch up data model from controller to renderer while main thread is locked
@ -239,22 +239,22 @@ public Q_SLOTS:
void destroyContext();
protected:
virtual void mouseDoubleClickEvent(QMouseEvent *event);
virtual void touchEvent(QTouchEvent *event);
virtual void mousePressEvent(QMouseEvent *event);
virtual void mouseReleaseEvent(QMouseEvent *event);
virtual void mouseMoveEvent(QMouseEvent *event);
void mouseDoubleClickEvent(QMouseEvent *event) override;
void touchEvent(QTouchEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
#if QT_CONFIG(wheelevent)
virtual void wheelEvent(QWheelEvent *event);
void wheelEvent(QWheelEvent *event) override;
#endif
virtual void handleWindowChanged(QQuickWindow *win);
virtual void itemChange(ItemChange change, const ItemChangeData &value);
void itemChange(ItemChange change, const ItemChangeData &value) override;
virtual void updateWindowParameters();
virtual void handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode);
virtual void handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality);
virtual void handleSelectedElementChange(QAbstract3DGraph::ElementType type);
virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints);
virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
Q_SIGNALS:
void selectionModeChanged(AbstractDeclarative::SelectionFlags mode);

2
src/datavisualizationqml2/datavisualizationqml2_plugin.h
View File

@ -126,7 +126,7 @@ class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin
public:
QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
void registerTypes(const char *uri);
void registerTypes(const char *uri) override;
};
QT_END_NAMESPACE_DATAVISUALIZATION

6
src/datavisualizationqml2/declarativebars_p.h
View File

@ -101,9 +101,9 @@ public:
float floorLevel() const;
public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q_SIGNALS:
void rowAxisChanged(QCategory3DAxis *axis);

2
src/datavisualizationqml2/declarativerendernode_p.h
View File

@ -72,7 +72,7 @@ public:
void setQuickWindow(QQuickWindow *window);
void setSamples(int samples);
void preprocess();
void preprocess() override;
public Q_SLOTS:
void handleControllerDestroyed();

6
src/datavisualizationqml2/declarativescatter_p.h
View File

@ -79,9 +79,9 @@ public:
QScatter3DSeries *selectedSeries() const;
public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);

6
src/datavisualizationqml2/declarativesurface_p.h
View File

@ -82,9 +82,9 @@ public:
bool flipHorizontalGrid() const;
public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
void handleAxisXChanged(QAbstract3DAxis *axis) override;
void handleAxisYChanged(QAbstract3DAxis *axis) override;
void handleAxisZChanged(QAbstract3DAxis *axis) override;
Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);

4
src/datavisualizationqml2/declarativetheme_p.h
View File

@ -88,8 +88,8 @@ public:
ColorGradient *multiHighlightGradient() const;
// From QQmlParserStatus
virtual void classBegin();
virtual void componentComplete();
void classBegin() override;
void componentComplete() override;
Q_SIGNALS:
void singleHighlightGradientChanged(ColorGradient *gradient);