Added possibility to show series value

For line, spline and scatter series it is possible to show the point
values above the point. The format, color and the font of the label can
be set.
For bar series the format and position of the value label can be set.

Task-number: QTRD-2808
Change-Id: I0488d98c4d9060eaa8331e5b3c97dc83d86aeb0c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

10 files changed, 441 insertions, 0 deletions

diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index 3dcc30d3..f2c056a0 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -29,6 +29,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QBarSet*)
 Q_DECLARE_METATYPE(QList<QBarSet*>)
+Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
 
 class tst_QBarSeries : public QObject
 {
@@ -59,6 +60,8 @@ private slots:
     void barSets();
     void setLabelsVisible_data();
     void setLabelsVisible();
+    void setLabelsFormat();
+    void setLabelsPosition();
     void opacity();
     void mouseclicked_data();
     void mouseclicked();
@@ -79,6 +82,7 @@ void tst_QBarSeries::initTestCase()
 {
     qRegisterMetaType<QBarSet*>("QBarSet*");
     qRegisterMetaType<QList<QBarSet*> >("QList<QBarSet*>");
+    qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
 }
 
 void tst_QBarSeries::cleanupTestCase()
@@ -343,6 +347,60 @@ void tst_QBarSeries::setLabelsVisible()
     QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
 }
 
+void tst_QBarSeries::setLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+
+    QString format("(@value)");
+    m_barseries->setLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+    QCOMPARE(m_barseries->labelsFormat(), format);
+
+    m_barseries->setLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+}
+
+void tst_QBarSeries::setLabelsPosition()
+{
+    QSignalSpy labelsPositionSpy(m_barseries,
+                             SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
+    QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsCenter);
+
+    m_barseries->setLabelsPosition(QBarSeries::LabelsInsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    QList<QVariant> arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+                == QBarSeries::LabelsInsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsInsideEnd);
+
+    m_barseries->setLabelsPosition(QBarSeries::LabelsInsideBase);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QBarSeries::LabelsInsideBase);
+    QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsInsideBase);
+
+    m_barseries->setLabelsPosition(QBarSeries::LabelsOutsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QBarSeries::LabelsOutsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsOutsideEnd);
+
+    m_barseries->setLabelsPosition(QBarSeries::LabelsCenter);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QBarSeries::LabelsCenter);
+    QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsCenter);
+}
+
 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 fc6c4977..de5b868f 100644
--- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
+++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
@@ -28,6 +28,7 @@
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QBarSet*)
+Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
 
 class tst_QHorizontalBarSeries : public QObject
 {
@@ -56,6 +57,8 @@ private slots:
     void barSets();
     void setLabelsVisible_data();
     void setLabelsVisible();
+    void setLabelsFormat();
+    void setLabelsPosition();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -73,6 +76,7 @@ private:
 void tst_QHorizontalBarSeries::initTestCase()
 {
     qRegisterMetaType<QBarSet*>("QBarSet*");
+    qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
 }
 
 void tst_QHorizontalBarSeries::cleanupTestCase()
@@ -308,6 +312,60 @@ void tst_QHorizontalBarSeries::setLabelsVisible()
     QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
 }
 
+void tst_QHorizontalBarSeries::setLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+
+    QString format("(@value)");
+    m_barseries->setLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+    QCOMPARE(m_barseries->labelsFormat(), format);
+
+    m_barseries->setLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+}
+
+void tst_QHorizontalBarSeries::setLabelsPosition()
+{
+    QSignalSpy labelsPositionSpy(m_barseries,
+                             SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsCenter);
+
+    m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsInsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    QList<QVariant> arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalBarSeries::LabelsInsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsInsideEnd);
+
+    m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsInsideBase);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalBarSeries::LabelsInsideBase);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsInsideBase);
+
+    m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsOutsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalBarSeries::LabelsOutsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsOutsideEnd);
+
+    m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsCenter);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalBarSeries::LabelsCenter);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsCenter);
+}
+
 void tst_QHorizontalBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
index 1812196d..7ff2181a 100644
--- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
+++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
@@ -28,6 +28,7 @@
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QBarSet*)
+Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
 
 class tst_QHorizontalPercentBarSeries : public QObject
 {
@@ -44,6 +45,8 @@ private slots:
     void qhorizontalpercentbarseries();
     void type_data();
     void type();
+    void setLabelsFormat();
+    void setLabelsPosition();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -56,6 +59,7 @@ private:
 void tst_QHorizontalPercentBarSeries::initTestCase()
 {
     qRegisterMetaType<QBarSet*>("QBarSet*");
+    qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
 }
 
 void tst_QHorizontalPercentBarSeries::cleanupTestCase()
@@ -93,6 +97,60 @@ void tst_QHorizontalPercentBarSeries::type()
     QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeHorizontalPercentBar);
 }
 
+void tst_QHorizontalPercentBarSeries::setLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+
+    QString format("(@value)");
+    m_barseries->setLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+    QCOMPARE(m_barseries->labelsFormat(), format);
+
+    m_barseries->setLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+}
+
+void tst_QHorizontalPercentBarSeries::setLabelsPosition()
+{
+    QSignalSpy labelsPositionSpy(m_barseries,
+                             SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsCenter);
+
+    m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsInsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    QList<QVariant> arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalPercentBarSeries::LabelsInsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsInsideEnd);
+
+    m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsInsideBase);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalPercentBarSeries::LabelsInsideBase);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsInsideBase);
+
+    m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsOutsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalPercentBarSeries::LabelsOutsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsOutsideEnd);
+
+    m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsCenter);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalPercentBarSeries::LabelsCenter);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsCenter);
+}
+
 void tst_QHorizontalPercentBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
index f1940c6d..b25df764 100644
--- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
+++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
@@ -28,6 +28,7 @@
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QBarSet*)
+Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
 
 class tst_QHorizontalStackedBarSeries : public QObject
 {
@@ -44,6 +45,8 @@ private slots:
     void qhorizontalstackedbarseries();
     void type_data();
     void type();
+    void setLabelsFormat();
+    void setLabelsPosition();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -56,6 +59,7 @@ private:
 void tst_QHorizontalStackedBarSeries::initTestCase()
 {
     qRegisterMetaType<QBarSet*>("QBarSet*");
+    qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
 }
 
 void tst_QHorizontalStackedBarSeries::cleanupTestCase()
@@ -93,6 +97,60 @@ void tst_QHorizontalStackedBarSeries::type()
     QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeHorizontalStackedBar);
 }
 
+void tst_QHorizontalStackedBarSeries::setLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+
+    QString format("(@value)");
+    m_barseries->setLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+    QCOMPARE(m_barseries->labelsFormat(), format);
+
+    m_barseries->setLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+}
+
+void tst_QHorizontalStackedBarSeries::setLabelsPosition()
+{
+    QSignalSpy labelsPositionSpy(m_barseries,
+                             SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsCenter);
+
+    m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsInsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    QList<QVariant> arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalStackedBarSeries::LabelsInsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsInsideEnd);
+
+    m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsInsideBase);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalStackedBarSeries::LabelsInsideBase);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsInsideBase);
+
+    m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsOutsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalStackedBarSeries::LabelsOutsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsOutsideEnd);
+
+    m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsCenter);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QHorizontalStackedBarSeries::LabelsCenter);
+    QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsCenter);
+}
+
 void tst_QHorizontalStackedBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp
index 0781932c..4d270619 100644
--- a/tests/auto/qlineseries/tst_qlineseries.cpp
+++ b/tests/auto/qlineseries/tst_qlineseries.cpp
@@ -75,6 +75,8 @@ void tst_QLineSeries::qlineseries()
     QCOMPARE(series.points(), QList<QPointF>());
     QCOMPARE(series.pen(), QPen());
     QCOMPARE(series.pointsVisible(), false);
+    QCOMPARE(series.pointLabelsVisible(), false);
+    QCOMPARE(series.pointLabelsFormat(), QLatin1String("@xPoint, @yPoint"));
 
     series.append(QList<QPointF>());
     series.append(0.0,0.0);
@@ -91,6 +93,9 @@ void tst_QLineSeries::qlineseries()
     series.setPen(QPen());
     series.setPointsVisible(false);
 
+    series.setPointLabelsVisible(false);
+    series.setPointLabelsFormat(QString());
+
     m_chart->addSeries(&series);
     m_view->show();
     QTest::qWaitForWindowShown(m_view);
diff --git a/tests/auto/qml-qtquicktest/tst_barseries.qml b/tests/auto/qml-qtquicktest/tst_barseries.qml
index 169a749f..c5a5cfb7 100644
--- a/tests/auto/qml-qtquicktest/tst_barseries.qml
+++ b/tests/auto/qml-qtquicktest/tst_barseries.qml
@@ -34,6 +34,7 @@ Rectangle {
         function test_properties() {
             compare(barSeries.barWidth, 0.5);
             compare(barSeries.labelsVisible, false);
+            compare(barSeries.labelsPosition, BarSeries.LabelsCenter);
         }
 
         function test_setproperties() {
@@ -92,6 +93,12 @@ Rectangle {
             compare(barSeries.count, 0);
         }
 
+        function test_signals() {
+            labelsPositionSpy.clear();
+            barSeries.labelsPosition = BarSeries.LabelsOutsideEnd;
+            compare(labelsPositionSpy.count, 1, "onLabelsPositionChanged")
+        }
+
         function test_remove() {
             var setCount = 5;
             var valueCount = 50;
@@ -136,6 +143,11 @@ Rectangle {
                 target: barSeries
                 signalName: "barsetsRemoved"
             }
+            SignalSpy {
+                id: labelsPositionSpy
+                target: barSeries
+                signalName: "labelsPositionChanged"
+            }
         }
 
         StackedBarSeries {
diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
index 569e72e1..2d0cef96 100644
--- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
+++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
@@ -28,6 +28,7 @@
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QBarSet*)
+Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
 
 class tst_QPercentBarSeries : public QObject
 {
@@ -44,6 +45,8 @@ private slots:
     void qpercentbarseries();
     void type_data();
     void type();
+    void setLabelsFormat();
+    void setLabelsPosition();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -56,6 +59,7 @@ private:
 void tst_QPercentBarSeries::initTestCase()
 {
     qRegisterMetaType<QBarSet*>("QBarSet*");
+    qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
 }
 
 void tst_QPercentBarSeries::cleanupTestCase()
@@ -98,6 +102,60 @@ void tst_QPercentBarSeries::mouseclicked_data()
 
 }
 
+void tst_QPercentBarSeries::setLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+
+    QString format("(@value)");
+    m_barseries->setLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+    QCOMPARE(m_barseries->labelsFormat(), format);
+
+    m_barseries->setLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+}
+
+void tst_QPercentBarSeries::setLabelsPosition()
+{
+    QSignalSpy labelsPositionSpy(m_barseries,
+                             SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
+    QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsCenter);
+
+    m_barseries->setLabelsPosition(QPercentBarSeries::LabelsInsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    QList<QVariant> arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QPercentBarSeries::LabelsInsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsInsideEnd);
+
+    m_barseries->setLabelsPosition(QPercentBarSeries::LabelsInsideBase);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QPercentBarSeries::LabelsInsideBase);
+    QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsInsideBase);
+
+    m_barseries->setLabelsPosition(QPercentBarSeries::LabelsOutsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QPercentBarSeries::LabelsOutsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsOutsideEnd);
+
+    m_barseries->setLabelsPosition(QPercentBarSeries::LabelsCenter);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QPercentBarSeries::LabelsCenter);
+    QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsCenter);
+}
+
 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 6e848a24..6285aaa1 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -28,6 +28,7 @@
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QBarSet*)
+Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
 
 class tst_QStackedBarSeries : public QObject
 {
@@ -44,6 +45,8 @@ private slots:
     void qstackedbarseries();
     void type_data();
     void type();
+    void setLabelsFormat();
+    void setLabelsPosition();
     void mouseclicked_data();
     void mouseclicked();
     void mousehovered_data();
@@ -56,6 +59,7 @@ private:
 void tst_QStackedBarSeries::initTestCase()
 {
     qRegisterMetaType<QBarSet*>("QBarSet*");
+    qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
 }
 
 void tst_QStackedBarSeries::cleanupTestCase()
@@ -93,6 +97,60 @@ void tst_QStackedBarSeries::type()
     QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeStackedBar);
 }
 
+void tst_QStackedBarSeries::setLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+
+    QString format("(@value)");
+    m_barseries->setLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+    QCOMPARE(m_barseries->labelsFormat(), format);
+
+    m_barseries->setLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+    QCOMPARE(m_barseries->labelsFormat(), QString());
+}
+
+void tst_QStackedBarSeries::setLabelsPosition()
+{
+    QSignalSpy labelsPositionSpy(m_barseries,
+                             SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
+    QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsCenter);
+
+    m_barseries->setLabelsPosition(QStackedBarSeries::LabelsInsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    QList<QVariant> arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QStackedBarSeries::LabelsInsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsInsideEnd);
+
+    m_barseries->setLabelsPosition(QStackedBarSeries::LabelsInsideBase);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QStackedBarSeries::LabelsInsideBase);
+    QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsInsideBase);
+
+    m_barseries->setLabelsPosition(QStackedBarSeries::LabelsOutsideEnd);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QStackedBarSeries::LabelsOutsideEnd);
+    QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsOutsideEnd);
+
+    m_barseries->setLabelsPosition(QStackedBarSeries::LabelsCenter);
+    TRY_COMPARE(labelsPositionSpy.count(), 1);
+    arguments = labelsPositionSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
+            == QStackedBarSeries::LabelsCenter);
+    QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsCenter);
+}
+
 void tst_QStackedBarSeries::mouseclicked_data()
 {
 
diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp
index 34c4f5fe..c0721a35 100644
--- a/tests/auto/qxyseries/tst_qxyseries.cpp
+++ b/tests/auto/qxyseries/tst_qxyseries.cpp
@@ -81,6 +81,78 @@ void tst_QXYSeries::seriesOpacity()
     QCOMPARE(opacitySpy.count(), 3);
 }
 
+void tst_QXYSeries::pointLabelsFormat()
+{
+    QSignalSpy labelsFormatSpy(m_series, SIGNAL(pointLabelsFormatChanged(QString)));
+    QCOMPARE(m_series->pointLabelsFormat(), QLatin1String("@xPoint, @yPoint"));
+
+    QString format("@yPoint");
+    m_series->setPointLabelsFormat(format);
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    QList<QVariant> arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == format);
+
+    m_series->setPointLabelsFormat(QString());
+    TRY_COMPARE(labelsFormatSpy.count(), 1);
+    arguments = labelsFormatSpy.takeFirst();
+    QVERIFY(arguments.at(0).toString() == QString());
+
+}
+
+void tst_QXYSeries::pointLabelsVisible()
+{
+    QSignalSpy labelsVisibleSpy(m_series, SIGNAL(pointLabelsVisibilityChanged(bool)));
+    QCOMPARE(m_series->pointLabelsVisible(), false);
+
+    m_series->setPointLabelsVisible();
+    QCOMPARE(m_series->pointLabelsVisible(), true);
+    TRY_COMPARE(labelsVisibleSpy.count(), 1);
+    QList<QVariant> arguments = labelsVisibleSpy.takeFirst();
+    QVERIFY(arguments.at(0).toBool() == true);
+
+    m_series->setPointLabelsVisible(false);
+    QCOMPARE(m_series->pointLabelsVisible(), false);
+    TRY_COMPARE(labelsVisibleSpy.count(), 1);
+    arguments = labelsVisibleSpy.takeFirst();
+    QVERIFY(arguments.at(0).toBool() == false);
+}
+
+void tst_QXYSeries::pointLabelsFont()
+{
+    QFont defaultFont(m_series->pointLabelsFont());
+    QSignalSpy labelsFontSpy(m_series, SIGNAL(pointLabelsFontChanged(QFont)));
+
+    QFont font("Times", 10);
+    m_series->setPointLabelsFont(font);
+    TRY_COMPARE(labelsFontSpy.count(), 1);
+    QList<QVariant> arguments = labelsFontSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QFont>() == font);
+
+    m_series->setPointLabelsFont(defaultFont);
+    TRY_COMPARE(labelsFontSpy.count(), 1);
+    arguments = labelsFontSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QFont>() == defaultFont);
+
+}
+
+void tst_QXYSeries::pointLabelsColor()
+{
+    QColor defaultColor(QPen().color());
+    QSignalSpy labelsColorSpy(m_series, SIGNAL(pointLabelsColorChanged(QColor)));
+    QCOMPARE(m_series->pointLabelsColor(), defaultColor);
+
+    QColor color(Qt::blue);
+    m_series->setPointLabelsColor(color);
+    TRY_COMPARE(labelsColorSpy.count(), 1);
+    QList<QVariant> arguments = labelsColorSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QColor>() == color);
+
+    m_series->setPointLabelsColor(defaultColor);
+    TRY_COMPARE(labelsColorSpy.count(), 1);
+    arguments = labelsColorSpy.takeFirst();
+    QVERIFY(arguments.at(0).value<QColor>() == defaultColor);
+}
+
 void tst_QXYSeries::append_data()
 {
     QTest::addColumn< QList<QPointF> >("points");
diff --git a/tests/auto/qxyseries/tst_qxyseries.h b/tests/auto/qxyseries/tst_qxyseries.h
index 701f6829..0fad782c 100644
--- a/tests/auto/qxyseries/tst_qxyseries.h
+++ b/tests/auto/qxyseries/tst_qxyseries.h
@@ -42,6 +42,10 @@ public slots:
 private slots:
     void seriesName();
     void seriesVisible();
+    void pointLabelsFormat();
+    void pointLabelsVisible();
+    void pointLabelsFont();
+    void pointLabelsColor();
     void seriesOpacity();
     void oper_data();
     void oper();