diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-10-01 14:34:32 +0300 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-10-01 14:41:40 +0300 |
| commit | 4511fc46caf955a555814b7bc2190908b399e3d4 (patch) | |
| tree | d619dbb0da5bbc879c65c08d020455da1efcca64 /src/datavisualization/engine | |
| parent | 6a85b7fa00626c544103c48099260d7a36778686 (diff) | |
Texture coordinates updated on sample dimension change
It's about dimension change.
Task-number: QTRD-2357
Change-Id: Iaa64569954a12ea846221111cbcf63753f5235d3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 6238777e..c8aded31 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -242,12 +242,10 @@ void Surface3DRenderer::updateDataModel(QSurfaceDataProxy *dataProxy) // Note: Data setup can change samplespace (as min width/height is 1) if (m_cachedSmoothSurface) { m_surfaceObj->setUpSmoothData(m_dataArray, m_sampleSpace, m_heightNormalizer, - m_axisCacheY.min(), dimensionChanged, - m_cachedSelectionMode != QDataVis::ModeNone); + m_axisCacheY.min(), dimensionChanged); } else { m_surfaceObj->setUpData(m_dataArray, m_sampleSpace, m_heightNormalizer, - m_axisCacheY.min(), dimensionChanged, - m_cachedSelectionMode != QDataVis::ModeNone); + m_axisCacheY.min(), dimensionChanged); } if (dimensionChanged) @@ -295,10 +293,10 @@ void Surface3DRenderer::updateSliceDataModel(int selectionId) if (m_cachedSmoothSurface) { m_sliceSurfaceObj->setUpSmoothData(m_sliceDataArray, sliceRect, m_axisCacheY.min(), - m_heightNormalizer, true, true); + m_heightNormalizer, true); } else { m_sliceSurfaceObj->setUpData(m_sliceDataArray, sliceRect, m_heightNormalizer, - m_axisCacheY.min(), true, true); + m_axisCacheY.min(), true); } } } @@ -1808,12 +1806,10 @@ bool Surface3DRenderer::updateSmoothStatus(bool enable) if (m_surfaceObj && changed && m_sampleSpace.width() >= 2 && m_sampleSpace.height() >= 2) { if (m_cachedSmoothSurface) { m_surfaceObj->setUpSmoothData(m_dataArray, m_sampleSpace, m_heightNormalizer, - m_axisCacheY.min(), true, - m_cachedSelectionMode != QDataVis::ModeNone); + m_axisCacheY.min(), true); } else { m_surfaceObj->setUpData(m_dataArray, m_sampleSpace, m_heightNormalizer, - m_axisCacheY.min(), true, - m_cachedSelectionMode != QDataVis::ModeNone); + m_axisCacheY.min(), true); } } |