HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2814:79dc9c599f41

Fixed bar label visibility...

Titta Heikkala -

r2814:79dc9c599f41

parent child

Context file:

r2814:79dc9c599f41

src/charts/barchart/abstractbarchartitem.cpp +9 -4

                             QGraphicsTextItem *label = m_labels.at(itemIndex);
                             QString valueLabel;
                             if (presenter()) { // At startup presenter is not yet set, yet somehow update comes
-                                if (m_series->labelsFormat().isEmpty()) {
+                                if (barSet->value(category) == 0) {
-                                    valueLabel = presenter()->numberToString(barSet->value(category));
+                                    label->setVisible(false);
                                 } else {
-                                    valueLabel = m_series->labelsFormat();
+                                    label->setVisible(true);
-                                    valueLabel.replace(valueTag,
+                                    if (m_series->labelsFormat().isEmpty()) {
+                                        valueLabel = presenter()->numberToString(barSet->value(category));
+                                    } else {
+                                        valueLabel = m_series->labelsFormat();
+                                        valueLabel.replace(valueTag,
                                                        presenter()->numberToString(barSet->value(category)));
+                                    }
                                 }
                             }
                             label->setHtml(valueLabel);

src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +10 -5

@@ -116,12 +116,17 void HorizontalPercentBarChartItem::handleUpdatedBars()
116	qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;	116	qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;
117	QString vString(presenter()->numberToString(p, 'f', 0));	117	QString vString(presenter()->numberToString(p, 'f', 0));
118	QString valueLabel;	118	QString valueLabel;
119	if (m_series->labelsFormat().isEmpty()) {	119	if (p == 0) {
120	vString.append(QStringLiteral("%"));	120	label->setVisible(false);
121	valueLabel = vString;
122	} else {	121	} else {
123	valueLabel = m_series->labelsFormat();	122	label->setVisible(true);
124	valueLabel.replace(valueTag, vString);	123	if (m_series->labelsFormat().isEmpty()) {
		124	vString.append(QStringLiteral("%"));
		125	valueLabel = vString;
		126	} else {
		127	valueLabel = m_series->labelsFormat();
		128	valueLabel.replace(valueTag, vString);
		129	}
125	}	130	}
126	label->setHtml(valueLabel);	131	label->setHtml(valueLabel);
127	label->setFont(barSet->m_labelFont);	132	label->setFont(barSet->m_labelFont);

src/charts/barchart/qbarset.cpp +2 0

                 First value of set is assumed to belong to first category, second to second category and so on.
                 If set has fewer values than there are categories, then the missing values are assumed to be
                 at the end of set. For missing values in middle of a set, numerical value of zero is used.
+                Labels for zero value sets are not shown.
                 \sa QAbstractBarSeries, QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
                 First value of set is assumed to belong to first category, second to second category and so on.
                 If set has fewer values than there are categories, then the missing values are assumed to be
                 at the end of set. For missing values in middle of a set, numerical value of zero is used.
+                Labels for zero value sets are not shown.
                 \sa AbstractBarSeries, BarSeries, StackedBarSeries, PercentBarSeries
             */

src/charts/barchart/vertical/percent/percentbarchartitem.cpp +10 -5

@@ -121,12 +121,17 void PercentBarChartItem::handleUpdatedBars()
121	qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;	121	qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;
122	QString vString(presenter()->numberToString(p, 'f', 0));	122	QString vString(presenter()->numberToString(p, 'f', 0));
123	QString valueLabel;	123	QString valueLabel;
124	if (m_series->labelsFormat().isEmpty()) {	124	if (p == 0) {
125	vString.append(QStringLiteral("%"));	125	label->setVisible(false);
126	valueLabel = vString;
127	} else {	126	} else {
128	valueLabel = m_series->labelsFormat();	127	label->setVisible(true);
129	valueLabel.replace(valueTag, vString);	128	if (m_series->labelsFormat().isEmpty()) {
		129	vString.append(QStringLiteral("%"));
		130	valueLabel = vString;
		131	} else {
		132	valueLabel = m_series->labelsFormat();
		133	valueLabel.replace(valueTag, vString);
		134	}
130	}	135	}
131	label->setHtml(valueLabel);	136	label->setHtml(valueLabel);
132	label->setFont(barSet->m_labelFont);	137	label->setFont(barSet->m_labelFont);

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages