Move series specific visual elements to series, part 3

Surface pointer to use series mesh

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

3 files changed, 57 insertions, 0 deletions

diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index 68f83f01..666f4741 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -457,6 +457,56 @@ void GraphModifier::changeRows()
     }
 }
 
+void GraphModifier::changeMesh()
+{
+    static int model = 0;
+    switch (model) {
+    case 0:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCylinder);
+        m_graph->seriesList().at(0)->setMeshSmooth(false);
+        break;
+    case 1:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCylinder);
+        m_graph->seriesList().at(0)->setMeshSmooth(true);
+        break;
+    case 2:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCone);
+        m_graph->seriesList().at(0)->setMeshSmooth(false);
+        break;
+    case 3:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCone);
+        m_graph->seriesList().at(0)->setMeshSmooth(true);
+        break;
+    case 4:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBar);
+        m_graph->seriesList().at(0)->setMeshSmooth(false);
+        break;
+    case 5:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBar);
+        m_graph->seriesList().at(0)->setMeshSmooth(true);
+        break;
+    case 6:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshPyramid);
+        m_graph->seriesList().at(0)->setMeshSmooth(false);
+        break;
+    case 7:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshPyramid);
+        m_graph->seriesList().at(0)->setMeshSmooth(true);
+        break;
+    case 8:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBevelBar);
+        m_graph->seriesList().at(0)->setMeshSmooth(false);
+        break;
+    case 9:
+        m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBevelBar);
+        m_graph->seriesList().at(0)->setMeshSmooth(true);
+        break;
+    }
+    model++;
+    if (model > 9)
+        model = 0;
+}
+
 void GraphModifier::updateSamples()
 {
     switch (m_activeSample) {
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h
index cc71f7d5..d3e5ce68 100644
--- a/tests/surfacetest/graphmodifier.h
+++ b/tests/surfacetest/graphmodifier.h
@@ -69,6 +69,7 @@ public:
     void selectedPointChanged(const QPoint &point);
     void changeRow();
     void changeRows();
+    void changeMesh();
 
 public slots:
     void changeShadowQuality(int quality);
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 621557fb..aac4b8e2 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -151,6 +151,9 @@ int main(int argc, char *argv[])
     QPushButton *labelButton = new QPushButton(widget);
     labelButton->setText(QStringLiteral("Change label style"));
 
+    QPushButton *meshButton = new QPushButton(widget);
+    meshButton->setText(QStringLiteral("Change pointer mesh"));
+
     QComboBox *themeList = new QComboBox(widget);
     themeList->addItem(QStringLiteral("Qt"));
     themeList->addItem(QStringLiteral("Primary Colors"));
@@ -235,6 +238,7 @@ int main(int argc, char *argv[])
     vLayout->addWidget(new QLabel(QStringLiteral("Change font")));
     vLayout->addWidget(fontList);
     vLayout->addWidget(labelButton);
+    vLayout->addWidget(meshButton);
     vLayout->addWidget(new QLabel(QStringLiteral("Change theme")));
     vLayout->addWidget(themeList);
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
@@ -284,6 +288,8 @@ int main(int argc, char *argv[])
                      modifier, &GraphModifier::changeFont);
     QObject::connect(labelButton, &QPushButton::clicked,
                      modifier, &GraphModifier::changeStyle);
+    QObject::connect(meshButton, &QPushButton::clicked,
+                     modifier, &GraphModifier::changeMesh);
     QObject::connect(themeList, SIGNAL(currentIndexChanged(int)),
                      modifier, SLOT(changeTheme(int)));
     QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)),