From 08f9f6db042adb0fcb1211b048627e53b23ae026 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Mon, 24 Feb 2014 12:21:01 +0200 Subject: Set objects dirty on Y axis range change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2889 Change-Id: Iac92a50b6454d8e83ece984a13a0bcfa1f908d9f Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/surface3drenderer.cpp | 15 ++++++++++++++- src/datavisualization/engine/surface3drenderer_p.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) 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 QVectorsetObjectDirty(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 &seriesList); void updateRows(const QVector &rows); void updateItem(const QVector &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); -- cgit v1.2.3