Added support for bar series value label angle

Task-number: QTRD-3249
Change-Id: I98f670f631ec85d58122fab97283802834995b4d
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

7 files changed, 92 insertions, 0 deletions

diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index 580d35cc..d03f2378 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -60,6 +60,7 @@ private slots:
     void setLabelsVisible();
     void setLabelsFormat();
     void setLabelsPosition();
+    void setLabelsAngle();
     void opacity();
     void mouseclicked_data();
     void mouseclicked();
@@ -405,6 +406,19 @@ void tst_QBarSeries::setLabelsPosition()
     QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsCenter);
 }
 
+void tst_QBarSeries::setLabelsAngle()
+{
+    QSignalSpy labelsAngleSpy(m_barseries,
+                             SIGNAL(labelsAngleChanged(qreal)));
+    QCOMPARE(m_barseries->labelsAngle(), 0.0);
+
+    m_barseries->setLabelsAngle(55.0);
+    TRY_COMPARE(labelsAngleSpy.count(), 1);
+    QList<QVariant> arguments = labelsAngleSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<qreal>() == 55.0);
+    QCOMPARE(m_barseries->labelsAngle(), 55.0);
+}
+
 void tst_QBarSeries::opacity()
 {
     QSignalSpy opacitySpy(m_barseries, SIGNAL(opacityChanged()));
diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
index 643d2214..f32b8f73 100644
--- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
+++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
@@ -57,6 +57,7 @@ private slots:
     void setLabelsVisible();
     void setLabelsFormat();
     void setLabelsPosition();
+    void setLabelsAngle();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -370,6 +371,19 @@ void tst_QHorizontalBarSeries::setLabelsPosition()
     QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsCenter);
 }
 
+void tst_QHorizontalBarSeries::setLabelsAngle()
+{
+    QSignalSpy labelsAngleSpy(m_barseries,
+                             SIGNAL(labelsAngleChanged(qreal)));
+    QCOMPARE(m_barseries->labelsAngle(), 0.0);
+
+    m_barseries->setLabelsAngle(55.0);
+    TRY_COMPARE(labelsAngleSpy.count(), 1);
+    QList<QVariant> arguments = labelsAngleSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<qreal>() == 55.0);
+    QCOMPARE(m_barseries->labelsAngle(), 55.0);
+}
+
 void tst_QHorizontalBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
index cdba077c..b0408b8b 100644
--- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
+++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
@@ -45,6 +45,7 @@ private slots:
     void type();
     void setLabelsFormat();
     void setLabelsPosition();
+    void setLabelsAngle();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -155,6 +156,19 @@ void tst_QHorizontalPercentBarSeries::setLabelsPosition()
     QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsCenter);
 }
 
+void tst_QHorizontalPercentBarSeries::setLabelsAngle()
+{
+    QSignalSpy labelsAngleSpy(m_barseries,
+                             SIGNAL(labelsAngleChanged(qreal)));
+    QCOMPARE(m_barseries->labelsAngle(), 0.0);
+
+    m_barseries->setLabelsAngle(55.0);
+    TRY_COMPARE(labelsAngleSpy.count(), 1);
+    QList<QVariant> arguments = labelsAngleSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<qreal>() == 55.0);
+    QCOMPARE(m_barseries->labelsAngle(), 55.0);
+}
+
 void tst_QHorizontalPercentBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
index 0eb00fe2..73e75a25 100644
--- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
+++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
@@ -45,6 +45,7 @@ private slots:
     void type();
     void setLabelsFormat();
     void setLabelsPosition();
+    void setLabelsAngle();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -154,6 +155,19 @@ void tst_QHorizontalStackedBarSeries::setLabelsPosition()
     QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsCenter);
 }
 
+void tst_QHorizontalStackedBarSeries::setLabelsAngle()
+{
+    QSignalSpy labelsAngleSpy(m_barseries,
+                             SIGNAL(labelsAngleChanged(qreal)));
+    QCOMPARE(m_barseries->labelsAngle(), 0.0);
+
+    m_barseries->setLabelsAngle(55.0);
+    TRY_COMPARE(labelsAngleSpy.count(), 1);
+    QList<QVariant> arguments = labelsAngleSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<qreal>() == 55.0);
+    QCOMPARE(m_barseries->labelsAngle(), 55.0);
+}
+
 void tst_QHorizontalStackedBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
index 8f243cd8..de49a6ac 100644
--- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
+++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
@@ -45,6 +45,7 @@ private slots:
     void type();
     void setLabelsFormat();
     void setLabelsPosition();
+    void setLabelsAngle();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -160,6 +161,19 @@ void tst_QPercentBarSeries::setLabelsPosition()
     QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsCenter);
 }
 
+void tst_QPercentBarSeries::setLabelsAngle()
+{
+    QSignalSpy labelsAngleSpy(m_barseries,
+                             SIGNAL(labelsAngleChanged(qreal)));
+    QCOMPARE(m_barseries->labelsAngle(), 0.0);
+
+    m_barseries->setLabelsAngle(55.0);
+    TRY_COMPARE(labelsAngleSpy.count(), 1);
+    QList<QVariant> arguments = labelsAngleSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<qreal>() == 55.0);
+    QCOMPARE(m_barseries->labelsAngle(), 55.0);
+}
+
 void tst_QPercentBarSeries::mouseclicked()
 {
     SKIP_IF_CANNOT_TEST_MOUSE_EVENTS();
diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
index 01939392..9dc51aee 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -45,6 +45,7 @@ private slots:
     void type();
     void setLabelsFormat();
     void setLabelsPosition();
+    void setLabelsAngle();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -154,6 +155,19 @@ void tst_QStackedBarSeries::setLabelsPosition()
     QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsCenter);
 }
 
+void tst_QStackedBarSeries::setLabelsAngle()
+{
+    QSignalSpy labelsAngleSpy(m_barseries,
+                             SIGNAL(labelsAngleChanged(qreal)));
+    QCOMPARE(m_barseries->labelsAngle(), 0.0);
+
+    m_barseries->setLabelsAngle(55.0);
+    TRY_COMPARE(labelsAngleSpy.count(), 1);
+    QList<QVariant> arguments = labelsAngleSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<qreal>() == 55.0);
+    QCOMPARE(m_barseries->labelsAngle(), 55.0);
+}
+
 void tst_QStackedBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml
index 0a2ec3e4..98b7ab8c 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml
@@ -186,6 +186,14 @@ Row {
             text: "set 1 label color"
             onClicked: series.at(0).labelColor = main.nextColor();
         }
+        Button {
+            text: "labels angle +"
+            onClicked: series.labelsAngle = series.labelsAngle + 5;
+        }
+        Button {
+            text: "labels angle -"
+            onClicked: series.labelsAngle = series.labelsAngle - 5;
+        }
         FontEditor {
             id: fontEditor
             fontDescription: "label"