Add series name property

+Don't call updateScene for every render cycle
+Fixed item label update when format or name changes
+Misc cosmetic fixes

Task-number: QTRD-2736
Task-number: QTRD-2571
Change-Id: I43aa6b8e3202b09529b17a22bb24d05fcb545609
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 9973069b..3eee8ff0 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -1471,15 +1471,16 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         // Draw the selection label
         LabelItem &labelItem = selectedItem->selectionLabelItem();
         if (m_selectedItem != selectedItem || m_updateLabels
-                || !labelItem.textureId()) {
+                || !labelItem.textureId() || m_selectionLabelDirty) {
             QString labelText = selectedItem->selectionLabel();
-            if (labelText.isNull()) {
+            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();
 
@@ -1511,8 +1512,10 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                                                                 selectedItem->position().z());
                     labelText.replace(zLabelTag, valueLabelText);
                 }
+                labelText.replace(seriesNameTag, m_visibleSeriesList[m_selectedItemSeriesIndex].name());
 
                 selectedItem->setSelectionLabel(labelText);
+                m_selectionLabelDirty = false;
             }
             m_drawer->generateLabelItem(labelItem, labelText);
             m_selectedItem = selectedItem;