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>

3 files changed, 15 insertions, 1 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index d4a6c108..92c8d526 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -109,6 +109,9 @@ int main(int argc, char **argv)
     QPushButton *toggleSeriesVisibilityButton = new QPushButton(widget);
     toggleSeriesVisibilityButton->setText(QStringLiteral("Toggle visibility"));
 
+    QPushButton *changeSeriesNameButton = new QPushButton(widget);
+    changeSeriesNameButton->setText(QStringLiteral("Series name"));
+
     QPushButton *startTimerButton = new QPushButton(widget);
     startTimerButton->setText(QStringLiteral("Start/stop timer"));
 
@@ -176,6 +179,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(addSeriesButton, 0, Qt::AlignTop);
     vLayout->addWidget(removeSeriesButton, 0, Qt::AlignTop);
     vLayout->addWidget(toggleSeriesVisibilityButton, 0, Qt::AlignTop);
+    vLayout->addWidget(changeSeriesNameButton, 0, Qt::AlignTop);
     vLayout->addWidget(startTimerButton, 0, Qt::AlignTop);
     vLayout->addWidget(gradientBtoYPB, 0, Qt::AlignTop);
     vLayout->addWidget(backgroundCheckBox);
@@ -230,6 +234,8 @@ int main(int argc, char **argv)
                      &ScatterDataModifier::removeSeries);
     QObject::connect(toggleSeriesVisibilityButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::toggleSeriesVisibility);
+    QObject::connect(changeSeriesNameButton, &QPushButton::clicked, modifier,
+                     &ScatterDataModifier::changeSeriesName);
     QObject::connect(startTimerButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::startStopTimer);
     QObject::connect(gradientBtoYPB, &QPushButton::clicked, modifier,
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 58f5b355..9482ee18 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -476,6 +476,12 @@ void ScatterDataModifier::toggleSeriesVisibility()
         m_targetSeries->setVisible(!m_targetSeries->isVisible());
 }
 
+void ScatterDataModifier::changeSeriesName()
+{
+    if (m_targetSeries)
+        m_targetSeries->setName(m_targetSeries->name().append("-").append(QString::number(qrand() % 10)));
+}
+
 void ScatterDataModifier::handleAxisXChanged(QValue3DAxis *axis)
 {
     qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_chart->axisX());
@@ -526,7 +532,8 @@ QScatter3DSeries *ScatterDataModifier::createAndAddSeries()
         m_targetSeries = series;
 
     m_chart->addSeries(series);
-    series->setItemLabelFormat(QString("%1: @xLabel - @yLabel - @zLabel").arg(counter++));
+    series->setName(QString("Series %1").arg(counter++));
+    series->setItemLabelFormat(QStringLiteral("@seriesName: @xLabel - @yLabel - @zLabel"));
     series->setMesh(QAbstract3DSeries::MeshSphere);
     series->setMeshSmooth(true);
     series->setBaseColor(QColor(rand() % 256, rand() % 256, rand() % 256));
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 7906eac0..ce6c2073 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -68,6 +68,7 @@ public slots:
     void addSeries();
     void removeSeries();
     void toggleSeriesVisibility();
+    void changeSeriesName();
 
     void handleAxisXChanged(QValue3DAxis *axis);
     void handleAxisYChanged(QValue3DAxis *axis);