diff options
author | Mika Salmela <mika.salmela@digia.com> | 2014-02-24 12:21:01 +0200 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2014-02-24 13:12:25 +0200 |
commit | 08f9f6db042adb0fcb1211b048627e53b23ae026 (patch) | |
tree | 4af3b655e2b3ac5f00079289900e3e6d455f0656 /src | |
parent | 1437d0519e811624fc0f05e7b60fc9163816d227 (diff) |
Set objects dirty on Y axis range change
Task-number: QTRD-2889
Change-Id: Iac92a50b6454d8e83ece984a13a0bcfa1f908d9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 15 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3drenderer_p.h | 1 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index fe79efe4..47978170 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -393,6 +393,17 @@ void Surface3DRenderer::updateItem(const QVector<Surface3DController::ChangeItem updateSelectedPoint(m_selectedPoint, m_selectedSeries); } +void Surface3DRenderer::updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, + float max) +{ + Abstract3DRenderer::updateAxisRange(orientation, min, max); + + if (orientation == QAbstract3DAxis::AxisOrientationY) { + foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList) + cache->setObjectDirty(true); + } +} + void Surface3DRenderer::updateSliceDataModel(const QPoint &point) { foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList) @@ -576,7 +587,8 @@ void Surface3DRenderer::updateSliceObject(SurfaceSeriesRenderCache *cache, const } } -QRect Surface3DRenderer::calculateSampleRect(SurfaceSeriesRenderCache *cache, const QSurfaceDataArray &array) +QRect Surface3DRenderer::calculateSampleRect(SurfaceSeriesRenderCache *cache, + const QSurfaceDataArray &array) { QRect sampleSpace; @@ -2080,6 +2092,7 @@ void Surface3DRenderer::updateObjects(SurfaceSeriesRenderCache *cache, bool dime QSurfaceDataArray &dataArray = cache->dataArray(); const QRect &sampleSpace = cache->sampleSpace(); + if (cache->isFlatShadingEnabled()) { cache->surfaceObject()->setUpData(dataArray, sampleSpace, m_heightNormalizer, m_axisCacheY.min(), dimensionChanged); diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 9945a1d4..7a4422e4 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -107,6 +107,7 @@ public: void modifiedSeriesList(const QVector<QSurface3DSeries *> &seriesList); void updateRows(const QVector<Surface3DController::ChangeRow> &rows); void updateItem(const QVector<Surface3DController::ChangeItem> &points); + void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max); void updateScene(Q3DScene *scene); void updateSlicingActive(bool isSlicing); void updateSelectedPoint(const QPoint &position, const QSurface3DSeries *series); |