Added series rotation and bar item rotation support

Task-number: QTRD-2654

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

3 files changed, 39 insertions, 0 deletions

diff --git a/tests/directional/main.cpp b/tests/directional/main.cpp
index 359868cc..34d2e4a1 100644
--- a/tests/directional/main.cpp
+++ b/tests/directional/main.cpp
@@ -78,6 +78,9 @@ int main(int argc, char **argv)
     QPushButton *cameraButton = new QPushButton(widget);
     cameraButton->setText(QStringLiteral("Change camera preset"));
 
+    QPushButton *toggleRotationButton = new QPushButton(widget);
+    toggleRotationButton->setText(QStringLiteral("Toggle rotation"));
+
     QCheckBox *backgroundCheckBox = new QCheckBox(widget);
     backgroundCheckBox->setText(QStringLiteral("Show background"));
     backgroundCheckBox->setChecked(true);
@@ -103,6 +106,7 @@ int main(int argc, char **argv)
     //! [5]
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(cameraButton, 0, Qt::AlignTop);
+    vLayout->addWidget(toggleRotationButton, 0, Qt::AlignTop);
     vLayout->addWidget(backgroundCheckBox);
     vLayout->addWidget(gridCheckBox);
     vLayout->addWidget(new QLabel(QStringLiteral("Change dot style")));
@@ -122,6 +126,8 @@ int main(int argc, char **argv)
     //! [6]
     QObject::connect(cameraButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changePresetCamera);
+    QObject::connect(toggleRotationButton, &QPushButton::clicked, modifier,
+                     &ScatterDataModifier::toggleRotation);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeLabelStyle);
 
diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp
index f7089ae4..5da48483 100644
--- a/tests/directional/scatterdatamodifier.cpp
+++ b/tests/directional/scatterdatamodifier.cpp
@@ -56,6 +56,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     series->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel");
     m_graph->addSeries(series);
 
+    QObject::connect(&m_rotationTimer, &QTimer::timeout, this,
+                     &ScatterDataModifier::triggerRotation);
+
     addData();
 }
 
@@ -164,6 +167,24 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQ
     emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
 }
 
+void ScatterDataModifier::triggerRotation()
+{
+    if (m_graph->seriesList().size()) {
+        int selectedIndex = m_graph->seriesList().at(0)->selectedItem();
+        if (selectedIndex != QScatter3DSeries::invalidSelectionIndex()) {
+            static float itemAngle = 0.0f;
+            QScatterDataItem item(*(m_graph->seriesList().at(0)->dataProxy()->itemAt(selectedIndex)));
+            QQuaternion itemRotation = QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, itemAngle++);
+            item.setRotation(itemRotation);
+            m_graph->seriesList().at(0)->dataProxy()->setItem(selectedIndex, item);
+        } else {
+            static float seriesAngle = 0.0f;
+            QQuaternion rotation = QQuaternion::fromAxisAndAngle(1.0f, 1.0f, 1.0f, seriesAngle++);
+            m_graph->seriesList().at(0)->setMeshRotation(rotation);
+        }
+    }
+}
+
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
     QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
@@ -179,3 +200,11 @@ void ScatterDataModifier::setGridEnabled(int enabled)
 {
     m_graph->activeTheme()->setGridEnabled((bool)enabled);
 }
+
+void ScatterDataModifier::toggleRotation()
+{
+    if (m_rotationTimer.isActive())
+        m_rotationTimer.stop();
+    else
+        m_rotationTimer.start(20);
+}
diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h
index e3979818..f920d43f 100644
--- a/tests/directional/scatterdatamodifier.h
+++ b/tests/directional/scatterdatamodifier.h
@@ -22,6 +22,7 @@
 #include <QtDataVisualization/q3dscatter.h>
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtGui/QFont>
+#include <QtCore/QTimer>
 
 using namespace QtDataVisualization;
 
@@ -40,6 +41,7 @@ public:
     void changeFontSize(int fontsize);
     void setBackgroundEnabled(int enabled);
     void setGridEnabled(int enabled);
+    void toggleRotation();
     void start();
 
 public slots:
@@ -47,6 +49,7 @@ public slots:
     void changeTheme(int theme);
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
+    void triggerRotation();
 
 signals:
     void backgroundEnabledChanged(bool enabled);
@@ -59,6 +62,7 @@ private:
     int m_fontSize;
     QAbstract3DSeries::Mesh m_style;
     bool m_smooth;
+    QTimer m_rotationTimer;
 };
 
 #endif