From f5a7ef4ddac07a9ff677e313dd9ab0ab05c7f976 2015-09-23 07:45:20
From: Titta Heikkala <titta.heikkala@theqtcompany.com>
Date: 2015-09-23 07:45:20
Subject: [PATCH] Fix bar series label visibility

Fixed label visibility for bar series.

Change-Id: I78fa6ae345b9d4f4d54d43478dc2136d0e735a03
Task-number: QTRD-3695
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

---

diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp
index 6f8ecb7..069f2ce 100644
--- a/src/charts/barchart/abstractbarchartitem.cpp
+++ b/src/charts/barchart/abstractbarchartitem.cpp
@@ -228,7 +228,7 @@ void AbstractBarChartItem::handleUpdatedBars()
                     if (barSet->value(category) == 0) {
                         label->setVisible(false);
                     } else {
-                        label->setVisible(true);
+                        label->setVisible(m_series->isLabelsVisible());
                         if (m_series->labelsFormat().isEmpty()) {
                             valueLabel = presenter()->numberToString(barSet->value(category));
                         } else {
diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp
index 62db806..4f6e7e2 100644
--- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp
+++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp
@@ -119,7 +119,7 @@ void HorizontalPercentBarChartItem::handleUpdatedBars()
             if (p == 0) {
                 label->setVisible(false);
             } else {
-                label->setVisible(true);
+                label->setVisible(m_series->isLabelsVisible());
                 if (m_series->labelsFormat().isEmpty()) {
                     vString.append(QStringLiteral("%"));
                     valueLabel = vString;
diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
index 6a998df..98eac5d 100644
--- a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
@@ -124,7 +124,7 @@ void PercentBarChartItem::handleUpdatedBars()
             if (p == 0) {
                 label->setVisible(false);
             } else {
-                label->setVisible(true);
+                label->setVisible(m_series->isLabelsVisible());
                 if (m_series->labelsFormat().isEmpty()) {
                     vString.append(QStringLiteral("%"));
                     valueLabel = vString;