Enable querying selection label via API

Also enable suppressing drawing the label on graph.

Selection label formatting was consequently moved from renderers
to series.

Task-number: QTRD-2896

Change-Id: Ia6a1a40298d8db0f54349de3eb27fb0b683dd302
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

13 files changed, 130 insertions, 178 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 7f905243..8c94a9a4 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -783,6 +783,8 @@ Q3DScene *Abstract3DController::scene()
 void Abstract3DController::markDataDirty()
 {
     m_isDataDirty = true;
+
+    markSeriesItemLabelsDirty();
     emitNeedRender();
 }
 
@@ -813,6 +815,8 @@ void Abstract3DController::handleAxisTitleChangedBySender(QObject *sender)
         m_changeTracker.axisZTitleChanged = true;
     else
         qWarning() << __FUNCTION__ << "invoked for invalid axis";
+
+    markSeriesItemLabelsDirty();
     emitNeedRender();
 }
 
@@ -831,6 +835,8 @@ void Abstract3DController::handleAxisLabelsChangedBySender(QObject *sender)
         m_changeTracker.axisZLabelsChanged = true;
     else
         qWarning() << __FUNCTION__ << "invoked for invalid axis";
+
+    markSeriesItemLabelsDirty();
     emitNeedRender();
 }
 
@@ -992,6 +998,12 @@ void Abstract3DController::handleSeriesVisibilityChangedBySender(QObject *sender
     emitNeedRender();
 }
 
+void Abstract3DController::markSeriesItemLabelsDirty()
+{
+    for (int i = 0; i < m_seriesList.size(); i++)
+        m_seriesList.at(i)->d_ptr->markItemLabelDirty();
+}
+
 void Abstract3DController::setAxisHelper(QAbstract3DAxis::AxisOrientation orientation,
                                          QAbstract3DAxis *axis, QAbstract3DAxis **axisPtr)
 {
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 13c334be..e433c97e 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -242,6 +242,8 @@ public:
     virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
     virtual void handlePendingClick() = 0;
 
+    void markSeriesItemLabelsDirty();
+
 public slots:
     void handleAxisTitleChanged(const QString &title);
     void handleAxisLabelsChanged();
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index f0aec0cc..6b3393ab 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -379,14 +379,8 @@ void Abstract3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLi
         visibleCount = 0;
     }
     foreach (QAbstract3DSeries *current, seriesList) {
-        if (current->isVisible()) {
-            // Item selection label may need update
-            if (current->d_ptr->m_changeTracker.nameChanged
-                    || current->d_ptr->m_changeTracker.itemLabelFormatChanged) {
-                m_selectionLabelDirty = true;
-            }
+        if (current->isVisible())
             m_visibleSeriesList[visibleCount++].populate(current, this);
-        }
     }
 }
 
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 0b2a4834..ec170129 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -106,6 +106,7 @@ void Bars3DController::handleArrayReset()
     if (series->isVisible()) {
         adjustAxisRanges();
         m_isDataDirty = true;
+        series->d_ptr->markItemLabelDirty();
     }
     // Clear selection unless still valid
     setSelectedBar(m_selectedBar, m_selectedBarSeries, false);
@@ -132,6 +133,7 @@ void Bars3DController::handleRowsChanged(int startIndex, int count)
     if (series->isVisible()) {
         adjustAxisRanges();
         m_isDataDirty = true;
+        series->d_ptr->markItemLabelDirty();
     }
     emitNeedRender();
 }
@@ -193,6 +195,7 @@ void Bars3DController::handleItemChanged(int rowIndex, int columnIndex)
     if (series->isVisible()) {
         adjustAxisRanges();
         m_isDataDirty = true;
+        series->d_ptr->markItemLabelDirty();
     }
     emitNeedRender();
 }
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 15aa526f..127cfb0e 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -260,6 +260,26 @@ void Bars3DRenderer::updateData()
     updateSelectedBar(m_selectedBarPos, m_selectedBarSeries);
 }
 
+void Bars3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesList,
+                                  bool updateVisibility)
+{
+    Abstract3DRenderer::updateSeries(seriesList, updateVisibility);
+
+    bool noSelection = true;
+    int seriesCount = m_visibleSeriesList.size();
+    for (int i = 0; i < seriesCount; i++) {
+        QBar3DSeries *barSeries = static_cast<QBar3DSeries *>(m_visibleSeriesList.at(i).series());
+        if (noSelection
+                && barSeries->selectedBar() != QBar3DSeries::invalidSelectionPosition()
+                && selectionLabel() != m_visibleSeriesList.at(i).itemLabel()) {
+            m_selectionLabelDirty = true;
+            noSelection = false;
+        }
+    }
+    if (noSelection && !selectionLabel().isEmpty())
+        m_selectionLabelDirty = true;
+}
+
 void Bars3DRenderer::updateScene(Q3DScene *scene)
 {
     if (m_hasNegativeValues)
@@ -1002,7 +1022,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         }
         glCullFace(GL_BACK);
         drawLabels(true, activeCamera, viewMatrix, projectionMatrix, rowScaleFactor,
-                   columnScaleFactor, false, selectedBar);
+                   columnScaleFactor);
         glEnable(GL_DITHER);
 
         // Read color under cursor
@@ -1643,7 +1663,41 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         }
     }
     drawLabels(false, activeCamera, viewMatrix, projectionMatrix, rowScaleFactor,
-               columnScaleFactor, barSelectionFound, selectedBar);
+               columnScaleFactor);
+
+    // Handle selected bar label generation
+    if (barSelectionFound) {
+        // Print value of selected bar
+        glDisable(GL_DEPTH_TEST);
+        // Draw the selection label
+        LabelItem &labelItem = selectionLabelItem();
+        if (m_selectedBar != selectedBar || m_updateLabels || !labelItem.textureId()
+                || m_selectionLabelDirty) {
+            QString labelText = selectionLabel();
+            if (labelText.isNull() || m_selectionLabelDirty) {
+                labelText = m_visibleSeriesList[m_visualSelectedBarSeriesIndex].itemLabel();
+                setSelectionLabel(labelText);
+                m_selectionLabelDirty = false;
+            }
+            m_drawer->generateLabelItem(labelItem, labelText);
+            m_selectedBar = selectedBar;
+        }
+
+        m_drawer->drawLabel(*selectedBar, labelItem, viewMatrix, projectionMatrix,
+                            zeroVector, zeroVector, selectedBar->height(),
+                            m_cachedSelectionMode, m_labelShader,
+                            m_labelObj, activeCamera, true, false);
+
+        // Reset label update flag; they should have been updated when we get here
+        m_updateLabels = false;
+
+        glEnable(GL_DEPTH_TEST);
+    } else {
+        m_selectedBar = 0;
+    }
+
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_BLEND);
 
     // Release shader
     glUseProgram(0);
@@ -1652,8 +1706,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 
 void Bars3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCamera,
                                 const QMatrix4x4 &viewMatrix, const QMatrix4x4 &projectionMatrix,
-                                GLfloat rowScaleFactor, GLfloat columnScaleFactor,
-                                bool barSelectionFound, BarRenderItem *selectedBar) {
+                                GLfloat rowScaleFactor, GLfloat columnScaleFactor) {
     ShaderHelper *shader = 0;
     GLfloat alphaForValueSelection = labelValueAlpha / 255.0f;
     GLfloat alphaForRowSelection = labelRowAlpha / 255.0f;
@@ -1830,81 +1883,6 @@ void Bars3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCamer
     }
 
     glDisable(GL_POLYGON_OFFSET_FILL);
-
-    // Handle selected bar label generation
-    if (barSelectionFound) {
-        // Print value of selected bar
-        glDisable(GL_DEPTH_TEST);
-        // Draw the selection label
-        LabelItem &labelItem = selectionLabelItem();
-        if (m_selectedBar != selectedBar || m_updateLabels || !labelItem.textureId()
-                || m_selectionLabelDirty) {
-            QString labelText = selectionLabel();
-            if (labelText.isNull() || m_selectionLabelDirty) {
-                static const QString rowIndexTag(QStringLiteral("@rowIdx"));
-                static const QString rowLabelTag(QStringLiteral("@rowLabel"));
-                static const QString rowTitleTag(QStringLiteral("@rowTitle"));
-                static const QString colIndexTag(QStringLiteral("@colIdx"));
-                static const QString colLabelTag(QStringLiteral("@colLabel"));
-                static const QString colTitleTag(QStringLiteral("@colTitle"));
-                static const QString valueTitleTag(QStringLiteral("@valueTitle"));
-                static const QString valueLabelTag(QStringLiteral("@valueLabel"));
-                static const QString seriesNameTag(QStringLiteral("@seriesName"));
-
-                // Custom format expects printf format specifier. There is no tag for it.
-                labelText = m_axisCacheY.formatter()->stringForValue(
-                            qreal(selectedBar->value()),
-                            m_visibleSeriesList[m_visualSelectedBarSeriesIndex].itemLabelFormat());
-
-                int selBarPosRow = selectedBar->position().x();
-                int selBarPosCol = selectedBar->position().y();
-                labelText.replace(rowIndexTag, QString::number(selBarPosRow));
-                if (m_axisCacheZ.labels().size() > selBarPosRow)
-                    labelText.replace(rowLabelTag, m_axisCacheZ.labels().at(selBarPosRow));
-                else
-                    labelText.replace(rowLabelTag, QString());
-                labelText.replace(rowTitleTag, m_axisCacheZ.title());
-                labelText.replace(colIndexTag, QString::number(selBarPosCol));
-                if (m_axisCacheX.labels().size() > selBarPosCol)
-                    labelText.replace(colLabelTag, m_axisCacheX.labels().at(selBarPosCol));
-                else
-                    labelText.replace(colLabelTag, QString());
-                labelText.replace(colTitleTag, m_axisCacheX.title());
-                labelText.replace(valueTitleTag, m_axisCacheY.title());
-
-                if (labelText.contains(valueLabelTag)) {
-                    QString valueLabelText = m_axisCacheY.formatter()->stringForValue(
-                                qreal(selectedBar->value()), m_axisCacheY.labelFormat());
-                    labelText.replace(valueLabelTag, valueLabelText);
-                }
-
-                labelText.replace(seriesNameTag,
-                                  m_visibleSeriesList[m_visualSelectedBarSeriesIndex].name());
-
-                setSelectionLabel(labelText);
-                m_selectionLabelDirty = false;
-            }
-            m_drawer->generateLabelItem(labelItem, labelText);
-            m_selectedBar = selectedBar;
-        }
-
-        m_drawer->drawLabel(*selectedBar, labelItem, viewMatrix, projectionMatrix,
-                            zeroVector, zeroVector, selectedBar->height(),
-                            m_cachedSelectionMode, shader,
-                            m_labelObj, activeCamera, true, false);
-
-        // Reset label update flag; they should have been updated when we get here
-        m_updateLabels = false;
-
-        glEnable(GL_DEPTH_TEST);
-    } else {
-        m_selectedBar = 0;
-    }
-
-    if (!drawSelection) {
-        glDisable(GL_TEXTURE_2D);
-        glDisable(GL_BLEND);
-    }
 }
 
 void Bars3DRenderer::updateMultiSeriesScaling(bool uniform)
diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 3e7e5178..fba5d830 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -114,6 +114,7 @@ public:
     ~Bars3DRenderer();
 
     void updateData();
+    void updateSeries(const QList<QAbstract3DSeries *> &seriesList, bool updateVisibility);
     void updateScene(Q3DScene *scene);
     void render(GLuint defaultFboHandle = 0);
 
@@ -145,8 +146,7 @@ private:
     void drawScene(GLuint defaultFboHandle);
     void drawLabels(bool drawSelection, const Q3DCamera *activeCamera,
                     const QMatrix4x4 &viewMatrix, const QMatrix4x4 &projectionMatrix,
-                    GLfloat rowScaleFactor, GLfloat columnScaleFactor,
-                    bool barSelectionFound, BarRenderItem *selectedBar);
+                    GLfloat rowScaleFactor, GLfloat columnScaleFactor);
 
     void loadBackgroundMesh();
     void loadGridLineMesh();
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index bf283495..a28ee851 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -125,6 +125,7 @@ void Scatter3DController::handleArrayReset()
         m_isDataDirty = true;
     }
     setSelectedItem(m_selectedItem, m_selectedItemSeries);
+    series->d_ptr->markItemLabelDirty();
     emitNeedRender();
 }
 
@@ -148,6 +149,7 @@ void Scatter3DController::handleItemsChanged(int startIndex, int count)
     if (series->isVisible()) {
         adjustValueAxisRange();
         m_isDataDirty = true;
+        series->d_ptr->markItemLabelDirty();
     }
     emitNeedRender();
 }
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index a6633183..43c78137 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -171,18 +171,30 @@ void Scatter3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
     if (m_cachedItemSize.size() != seriesCount)
         m_cachedItemSize.resize(seriesCount);
 
+    bool noSelection = true;
     for (int series = 0; series < seriesCount; series++) {
-        itemSize = static_cast<QScatter3DSeries *>(m_visibleSeriesList.at(series).series())->itemSize();
+        QScatter3DSeries *scatterSeries =
+                static_cast<QScatter3DSeries *>(m_visibleSeriesList.at(series).series());
+        itemSize = scatterSeries->itemSize();
         if (maxItemSize < itemSize)
             maxItemSize = itemSize;
         if (m_cachedItemSize.at(series) != itemSize)
             m_cachedItemSize[series] = itemSize;
+        if (noSelection
+                && scatterSeries->selectedItem() != QScatter3DSeries::invalidSelectionIndex()
+                && m_selectionLabel != m_visibleSeriesList.at(series).itemLabel()) {
+            m_selectionLabelDirty = true;
+            noSelection = false;
+        }
     }
     m_maxItemSize = maxItemSize;
     if (maxItemSize > defaultMaxSize)
         m_backgroundMargin = maxItemSize / itemScaler;
     else
         m_backgroundMargin = defaultMaxSize;
+
+    if (noSelection && !selectionLabel().isEmpty())
+        m_selectionLabelDirty = true;
 }
 
 void Scatter3DRenderer::updateData()
@@ -1251,38 +1263,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 || !labelItem.textureId() || m_selectionLabelDirty) {
             QString labelText = selectionLabel();
             if (labelText.isNull() || m_selectionLabelDirty) {
-                static const QString xTitleTag(QStringLiteral("@xTitle"));
-                static const QString yTitleTag(QStringLiteral("@yTitle"));
-                static const QString zTitleTag(QStringLiteral("@zTitle"));
-                static const QString xLabelTag(QStringLiteral("@xLabel"));
-                static const QString yLabelTag(QStringLiteral("@yLabel"));
-                static const QString zLabelTag(QStringLiteral("@zLabel"));
-                static const QString seriesNameTag(QStringLiteral("@seriesName"));
-
-                labelText = m_visibleSeriesList[m_selectedItemSeriesIndex].itemLabelFormat();
-
-                labelText.replace(xTitleTag, m_axisCacheX.title());
-                labelText.replace(yTitleTag, m_axisCacheY.title());
-                labelText.replace(zTitleTag, m_axisCacheZ.title());
-
-                if (labelText.contains(xLabelTag)) {
-                    QString valueLabelText = m_axisCacheX.formatter()->stringForValue(
-                                qreal(selectedItem->position().x()), m_axisCacheX.labelFormat());
-                    labelText.replace(xLabelTag, valueLabelText);
-                }
-                if (labelText.contains(yLabelTag)) {
-                    QString valueLabelText = m_axisCacheY.formatter()->stringForValue(
-                                qreal(selectedItem->position().y()), m_axisCacheY.labelFormat());
-                    labelText.replace(yLabelTag, valueLabelText);
-                }
-                if (labelText.contains(zLabelTag)) {
-                    QString valueLabelText = m_axisCacheZ.formatter()->stringForValue(
-                                qreal(selectedItem->position().z()), m_axisCacheZ.labelFormat());
-                    labelText.replace(zLabelTag, valueLabelText);
-                }
-                labelText.replace(seriesNameTag,
-                                  m_visibleSeriesList[m_selectedItemSeriesIndex].name());
-
+                labelText = m_visibleSeriesList[m_selectedItemSeriesIndex].itemLabel();
                 setSelectionLabel(labelText);
                 m_selectionLabelDirty = false;
             }
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index 8cfd9b08..7e51df1e 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -55,11 +55,6 @@ void SeriesRenderCache::populate(QAbstract3DSeries *series, Abstract3DRenderer *
 
     QAbstract3DSeriesChangeBitField &changeTracker = series->d_ptr->m_changeTracker;
 
-    if (seriesChanged || changeTracker.itemLabelFormatChanged) {
-        m_itemLabelFormat = series->itemLabelFormat();
-        changeTracker.itemLabelFormatChanged = false;
-    }
-
     if (seriesChanged || changeTracker.meshChanged  || changeTracker.meshSmoothChanged
             || changeTracker.userDefinedMeshChanged) {
         m_mesh = series->mesh();
@@ -182,6 +177,18 @@ void SeriesRenderCache::populate(QAbstract3DSeries *series, Abstract3DRenderer *
         m_name = series->name();
         changeTracker.nameChanged = false;
     }
+
+    if (seriesChanged || changeTracker.itemLabelChanged
+            || changeTracker.itemLabelVisibilityChanged) {
+        changeTracker.itemLabelChanged = false;
+        changeTracker.itemLabelVisibilityChanged = false;
+        // series->itemLabel() call resolves the item label and emits the changed signal
+        // if it is dirty, so we need to call it even if m_itemLabel is eventually set
+        // to an empty string.
+        m_itemLabel = series->itemLabel();
+        if (!series->isItemLabelVisible())
+            m_itemLabel = QString();
+    }
 }
 
 void SeriesRenderCache::cleanup(TextureHelper *texHelper)
diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h
index 1ef67c88..a6ae03cf 100644
--- a/src/datavisualization/engine/seriesrendercache_p.h
+++ b/src/datavisualization/engine/seriesrendercache_p.h
@@ -51,7 +51,6 @@ public:
     // It is not guaranteed to be valid while rendering and should only be used as an identifier.
     inline QAbstract3DSeries *series() const { return m_series; }
 
-    inline const QString &itemLabelFormat() const { return m_itemLabelFormat; }
     inline const QAbstract3DSeries::Mesh &mesh() const { return m_mesh; }
     inline const QQuaternion &meshRotation() const { return m_meshRotation; }
     inline void setMeshRotation(const QQuaternion &rotation) { m_meshRotation = rotation; }
@@ -66,10 +65,10 @@ public:
     inline const QVector3D &multiHighlightColor() const { return m_multiHighlightColor; }
     inline const GLuint &multiHighlightGradientTexture() const { return m_multiHighlightGradientTexture; }
     inline const QString &name() const { return m_name; }
+    inline const QString &itemLabel() const { return m_itemLabel; }
 
 protected:
     QAbstract3DSeries *m_series;
-    QString m_itemLabelFormat;
     ObjectHelper *m_object;
     QAbstract3DSeries::Mesh m_mesh;
     QQuaternion m_meshRotation;
@@ -85,6 +84,7 @@ protected:
     GLuint m_multiHighlightGradientTexture;
 
     QString m_name;
+    QString m_itemLabel;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 42e408dd..2d64e87d 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -297,6 +297,7 @@ void Surface3DController::handleArrayReset()
     }
     // Clear selection unless still valid
     setSelectedPoint(m_selectedPoint, m_selectedSeries, false);
+    series->d_ptr->markItemLabelDirty();
     emitNeedRender();
 }
 
@@ -321,6 +322,7 @@ void Surface3DController::handleRowsChanged(int startIndex, int count)
 
     QSurface3DSeries *series = sender->series();
     int oldChangeCount = m_changedRows.size();
+    int selectedRow = m_selectedPoint.x();
     for (int i = 0; i < count; i++) {
         bool newItem = true;
         int candidate = startIndex + i;
@@ -334,6 +336,8 @@ void Surface3DController::handleRowsChanged(int startIndex, int count)
         if (newItem) {
             ChangeRow newItem = {series, candidate};
             m_changedRows.append(newItem);
+            if (series == m_selectedSeries && selectedRow == candidate)
+                series->d_ptr->markItemLabelDirty();
         }
     }
     if (m_changedRows.size()) {
@@ -364,6 +368,9 @@ void Surface3DController::handleItemChanged(int rowIndex, int columnIndex)
         m_changedItems.append(newItem);
         m_changeTracker.itemChanged = true;
 
+        if (series == m_selectedSeries && m_selectedPoint == candidate)
+            series->d_ptr->markItemLabelDirty();
+
         adjustValueAxisRange();
         // Clear selection unless still valid
         setSelectedPoint(m_selectedPoint, m_selectedSeries, false);
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index fc31cd40..a3ee0971 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -254,23 +254,25 @@ void Surface3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
     foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList)
         cache->setValid(false);
 
+    bool noSelection = true;
     foreach (QAbstract3DSeries *series, seriesList) {
-        // Item selection label may need update
-        if (series->d_ptr->m_changeTracker.nameChanged
-                || series->d_ptr->m_changeTracker.itemLabelFormatChanged) {
-            m_selectionLabelDirty = true;
-        }
-
         QSurface3DSeries *surfaceSeries = static_cast<QSurface3DSeries *>(series);
         SurfaceSeriesRenderCache *cache = m_renderCacheList.value(surfaceSeries);
         if (!cache) {
             cache = new SurfaceSeriesRenderCache(this);
             m_renderCacheList[surfaceSeries] = cache;
-
             m_selectionTexturesDirty = true;
         }
         cache->setValid(true);
         cache->populate(surfaceSeries, this);
+
+        if (noSelection
+                && surfaceSeries->selectedPoint() != QSurface3DSeries::invalidSelectionPosition()
+                && selectionLabel() != cache->itemLabel()) {
+            m_selectionLabelDirty = true;
+            noSelection = false;
+        }
+
         if (cache->isFlatStatusDirty() && cache->sampleSpace().width()) {
             checkFlatSupport(cache);
             updateObjects(cache, true);
@@ -278,6 +280,9 @@ void Surface3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
         }
     }
 
+    if (noSelection && !selectionLabel().isEmpty())
+        m_selectionLabelDirty = true;
+
     // Remove non-valid objects from the cache list
     foreach (SurfaceSeriesRenderCache *cache, m_renderCacheList) {
         if (!cache->isValid()) {
@@ -2200,8 +2205,10 @@ void Surface3DRenderer::updateSelectionPoint(SurfaceSeriesRenderCache *cache, co
     }
 
     QString selectionLabel;
-    if (label)
-        selectionLabel = createSelectionLabel(cache, column, row);
+    if (label) {
+        m_selectionLabelDirty = false;
+        selectionLabel = cache->itemLabel();
+    }
 
     if (m_cachedIsSlicingActivated) {
         QVector3D subPosFront;
@@ -2282,46 +2289,6 @@ QPoint Surface3DRenderer::selectionIdToSurfacePoint(uint id)
     return QPoint(row, column);
 }
 
-QString Surface3DRenderer::createSelectionLabel(SurfaceSeriesRenderCache *cache,
-                                                int column, int row)
-{
-    QSurfaceDataArray &dataArray = cache->dataArray();
-    QString labelText = cache->itemLabelFormat();
-    static const QString xTitleTag(QStringLiteral("@xTitle"));
-    static const QString yTitleTag(QStringLiteral("@yTitle"));
-    static const QString zTitleTag(QStringLiteral("@zTitle"));
-    static const QString xLabelTag(QStringLiteral("@xLabel"));
-    static const QString yLabelTag(QStringLiteral("@yLabel"));
-    static const QString zLabelTag(QStringLiteral("@zLabel"));
-    static const QString seriesNameTag(QStringLiteral("@seriesName"));
-
-    labelText.replace(xTitleTag, m_axisCacheX.title());
-    labelText.replace(yTitleTag, m_axisCacheY.title());
-    labelText.replace(zTitleTag, m_axisCacheZ.title());
-
-    if (labelText.contains(xLabelTag)) {
-        QString valueLabelText = m_axisCacheX.formatter()->stringForValue(
-                    qreal(dataArray.at(row)->at(column).x()), m_axisCacheX.labelFormat());
-        labelText.replace(xLabelTag, valueLabelText);
-    }
-    if (labelText.contains(yLabelTag)) {
-        QString valueLabelText = m_axisCacheY.formatter()->stringForValue(
-                    qreal(dataArray.at(row)->at(column).y()), m_axisCacheY.labelFormat());
-        labelText.replace(yLabelTag, valueLabelText);
-    }
-    if (labelText.contains(zLabelTag)) {
-        QString valueLabelText = m_axisCacheZ.formatter()->stringForValue(
-                    qreal(dataArray.at(row)->at(column).z()), m_axisCacheZ.labelFormat());
-        labelText.replace(zLabelTag, valueLabelText);
-    }
-
-    labelText.replace(seriesNameTag, cache->name());
-
-    m_selectionLabelDirty = false;
-
-    return labelText;
-}
-
 void Surface3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
 {
     m_cachedShadowQuality = quality;
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 7a3b279f..39e96f55 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -160,7 +160,6 @@ private:
     void surfacePointSelected(const QPoint &point);
     void updateSelectionPoint(SurfaceSeriesRenderCache *cache, const QPoint &point, bool label);
     QPoint selectionIdToSurfacePoint(uint id);
-    QString createSelectionLabel(SurfaceSeriesRenderCache *cache, int column, int row);
 #if !defined(QT_OPENGL_ES_2)
     void loadGridLineMesh();
     void updateDepthBuffer();