diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-24 14:12:51 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-24 14:14:44 +0300 |
commit | 2f2b544c161a013b42d9d2ebe8065dc3510ddcdf (patch) | |
tree | 238b1f0cadc6684fc12a411db1adc9dc699a577d /src/datavisualization | |
parent | 216474d50b0a9af4726405fc09ffd03d6be7d158 (diff) |
Clear selection point if data changes
Task-number: QTRD-2313
Change-Id: Ie09d21eee1d118e3ced8d37e6623c7036deba4c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 14 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3drenderer_p.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 34ecd951..5d779789 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -159,8 +159,7 @@ Surface3DRenderer::~Surface3DRenderer() delete m_gridLineObj; delete m_labelObj; - if (m_selectionPointer) - delete m_selectionPointer; + delete m_selectionPointer; for (int i = 0; i < m_dataArray.size(); i++) delete m_dataArray.at(i); @@ -253,6 +252,8 @@ void Surface3DRenderer::updateDataModel(QSurfaceDataProxy *dataProxy) } } + m_selectionActive = false; + Abstract3DRenderer::updateDataModel(dataProxy); } @@ -1513,15 +1514,6 @@ QVector3D Surface3DRenderer::normalize(float x, float y, float z) return QVector3D(resX, resY, resZ); } -void Surface3DRenderer::surfacePointCleared() -{ - if (m_selectionPointer) { - delete m_selectionPointer; - m_selectionPointer = 0; - m_selectionActive = false; - } -} - void Surface3DRenderer::loadMeshFile() { qDebug() << __FUNCTION__ << "should we do something"; diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index c209e454..6b6f61c6 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -171,7 +171,6 @@ private: QString createSelectionLabel(qreal value, int column, int row); qreal columnInRange(int column); qreal rowInRange(int row); - void surfacePointCleared(); QVector3D normalize(float x, float y, float z); #if !defined(QT_OPENGL_ES_2) void updateDepthBuffer(); |