summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-06-26 17:47:24 +0300
committerAlexander Volkov <avolkov@astralinux.ru>2020-06-29 10:49:34 +0300
commit14684346ef899583008ab30c0950bd727e552c25 (patch)
treea88854c7d18551c27050869b5091bab8469b3c3e /src/datavisualization/engine
parent09e937788d0bb32a133fbf668b834fa13e7669c3 (diff)
Add missing overrideHEADdev
Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r--src/datavisualization/engine/bars3dcontroller_p.h32
-rw-r--r--src/datavisualization/engine/bars3drenderer_p.h48
-rw-r--r--src/datavisualization/engine/barseriesrendercache_p.h2
-rw-r--r--src/datavisualization/engine/q3dbars_p.h6
-rw-r--r--src/datavisualization/engine/q3dcamera.h2
-rw-r--r--src/datavisualization/engine/q3dscatter_p.h6
-rw-r--r--src/datavisualization/engine/q3dsurface_p.h6
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.h20
-rw-r--r--src/datavisualization/engine/scatter3dcontroller_p.h24
-rw-r--r--src/datavisualization/engine/scatter3drenderer_p.h52
-rw-r--r--src/datavisualization/engine/scatterseriesrendercache_p.h2
-rw-r--r--src/datavisualization/engine/surface3dcontroller_p.h24
-rw-r--r--src/datavisualization/engine/surface3drenderer_p.h42
-rw-r--r--src/datavisualization/engine/surfaceseriesrendercache_p.h4
14 files changed, 135 insertions, 135 deletions
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 74847ccd..dc50f773 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -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);
diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 3ca38e39..afedeef7 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -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,
diff --git a/src/datavisualization/engine/barseriesrendercache_p.h b/src/datavisualization/engine/barseriesrendercache_p.h
index 9b2ae1e1..f4ffd0c5 100644
--- a/src/datavisualization/engine/barseriesrendercache_p.h
+++ b/src/datavisualization/engine/barseriesrendercache_p.h
@@ -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); }
diff --git a/src/datavisualization/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h
index de581071..d9df2a6f 100644
--- a/src/datavisualization/engine/q3dbars_p.h
+++ b/src/datavisualization/engine/q3dbars_p.h
@@ -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();
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 9ef4a1b8..ec146f5d 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -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);
diff --git a/src/datavisualization/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h
index 748fc2e9..424a0bd1 100644
--- a/src/datavisualization/engine/q3dscatter_p.h
+++ b/src/datavisualization/engine/q3dscatter_p.h
@@ -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();
diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h
index c9c22d63..2ca65194 100644
--- a/src/datavisualization/engine/q3dsurface_p.h
+++ b/src/datavisualization/engine/q3dsurface_p.h
@@ -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();
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index a59259d1..a373f9f3 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -197,17 +197,17 @@ public:
bool hasContext() const;
protected:
- bool event(QEvent *event);
- void resizeEvent(QResizeEvent *event);
- void exposeEvent(QExposeEvent *event);
-
- void mouseDoubleClickEvent(QMouseEvent *event);
- void touchEvent(QTouchEvent *event);
- void mousePressEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
+ bool event(QEvent *event) override;
+ void resizeEvent(QResizeEvent *event) override;
+ void exposeEvent(QExposeEvent *event) override;
+
+ 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:
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index 46acd282..47231267 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -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:
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index f0366e0c..d41e3e0a 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -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();
diff --git a/src/datavisualization/engine/scatterseriesrendercache_p.h b/src/datavisualization/engine/scatterseriesrendercache_p.h
index 8f858d0f..94832918 100644
--- a/src/datavisualization/engine/scatterseriesrendercache_p.h
+++ b/src/datavisualization/engine/scatterseriesrendercache_p.h
@@ -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); }
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 8cbfeb60..1177f77d 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -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);
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index d527f248..9c45cdb5 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -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)
diff --git a/src/datavisualization/engine/surfaceseriesrendercache_p.h b/src/datavisualization/engine/surfaceseriesrendercache_p.h
index 4d435cd5..4741e568 100644
--- a/src/datavisualization/engine/surfaceseriesrendercache_p.h
+++ b/src/datavisualization/engine/surfaceseriesrendercache_p.h
@@ -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; }