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

Fixed bar label visibility...

Titta Heikkala -

r2814:79dc9c599f41

parent child

Context file:

r2814:79dc9c599f41

Collapse all files

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

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/abstractbarchartitem_p.h>
             #include <private/bar_p.h>
             #include <QtCharts/QBarSet>
             #include <private/qbarset_p.h>
             #include <QtCharts/QAbstractBarSeries>
             #include <private/qabstractbarseries_p.h>
             #include <QtCharts/QChart>
             #include <private/chartpresenter_p.h>
             #include <private/charttheme_p.h>
             #include <private/baranimation_p.h>
             #include <private/chartdataset_p.h>
             #include <QtGui/QPainter>
             #include <QtGui/QTextDocument>
             QT_CHARTS_BEGIN_NAMESPACE
             AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item) :
                 ChartItem(series->d_func(),item),
                 m_animation(0),
                 m_series(series)
             {
                 setFlag(ItemClipsChildrenToShape);
                 setFlag(QGraphicsItem::ItemIsSelectable);
                 connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleUpdatedBars()));
                 connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
                 connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
                 connect(series, SIGNAL(opacityChanged()), this, SLOT(handleOpacityChanged()));
                 connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(handleUpdatedBars()));
                 connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
                 connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
                         this, SLOT(handleLabelsPositionChanged()));
                 connect(series, SIGNAL(labelsAngleChanged(qreal)), this, SLOT(positionLabels()));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 handleDataStructureChanged();
                 handleVisibleChanged();
                 handleUpdatedBars();
             }
             AbstractBarChartItem::~AbstractBarChartItem()
             {
             }
             void AbstractBarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(painter);
                 Q_UNUSED(option);
                 Q_UNUSED(widget);
             }
             QRectF AbstractBarChartItem::boundingRect() const
             {
                 return m_rect;
             }
             void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)
             {
                 QSizeF size = geometry().size();
                 if (geometry().size().isValid()) {
                     if (m_animation) {
                         if (m_layout.count() == 0 || m_oldSize != size) {
                             initializeLayout();
                             m_oldSize = size;
                         }
                         m_animation->setup(m_layout, layout);
                         presenter()->startAnimation(m_animation);
                     } else {
                         setLayout(layout);
                         update();
                     }
                 }
             }
             void AbstractBarChartItem::setAnimation(BarAnimation *animation)
             {
                 m_animation = animation;
             }
             void AbstractBarChartItem::setLayout(const QVector<QRectF> &layout)
             {
                 if (layout.count() != m_bars.count())
                     return;
                 m_layout = layout;
                 for (int i = 0; i < m_bars.count(); i++)
                     m_bars.at(i)->setRect(layout.at(i));
                 positionLabels();
             }
             //handlers
             void AbstractBarChartItem::handleDomainUpdated()
             {
                 m_domainMinX = domain()->minX();
                 m_domainMaxX = domain()->maxX();
                 m_domainMinY = domain()->minY();
                 m_domainMaxY = domain()->maxY();
                 QRectF rect(QPointF(0,0),domain()->size());
                 if(m_rect != rect){
                     prepareGeometryChange();
                     m_rect = rect;
                 }
                 handleLayoutChanged();
             }
             void AbstractBarChartItem::handleLayoutChanged()
             {
                 if ((m_rect.width() <= 0) || (m_rect.height() <= 0))
                     return; // rect size zero.
                 QVector<QRectF> layout = calculateLayout();
                 applyLayout(layout);
                 handleUpdatedBars();
             }
             void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
             {
                 foreach (QGraphicsTextItem *label, m_labels)
                     label->setVisible(visible);
                 update();
             }
             void AbstractBarChartItem::handleDataStructureChanged()
             {
                 foreach (QGraphicsItem *item, childItems())
                     delete item;
                 m_bars.clear();
                 m_labels.clear();
                 m_layout.clear();
                 // Create new graphic items for bars
                 for (int c = 0; c < m_series->d_func()->categoryCount(); c++) {
                     for (int s = 0; s < m_series->count(); s++) {
                         QBarSet *set = m_series->d_func()->barsetAt(s);
                         // Bars
                         Bar *bar = new Bar(set, c, this);
                         m_bars.append(bar);
                         connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*)));
                         connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), m_series, SIGNAL(hovered(bool, int, QBarSet*)));
                         connect(bar, SIGNAL(pressed(int, QBarSet*)), m_series, SIGNAL(pressed(int, QBarSet*)));
                         connect(bar, SIGNAL(released(int, QBarSet*)),
                                 m_series, SIGNAL(released(int, QBarSet*)));
                         connect(bar, SIGNAL(doubleClicked(int, QBarSet*)),
                                 m_series, SIGNAL(doubleClicked(int, QBarSet*)));
                         connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
                         connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), set, SIGNAL(hovered(bool, int)));
                         connect(bar, SIGNAL(pressed(int, QBarSet*)), set, SIGNAL(pressed(int)));
                         connect(bar, SIGNAL(released(int, QBarSet*)), set, SIGNAL(released(int)));
                         connect(bar, SIGNAL(doubleClicked(int, QBarSet*)), set, SIGNAL(doubleClicked(int)));
                         //            m_layout.append(QRectF(0, 0, 1, 1));
                         // Labels
                         QGraphicsTextItem *newLabel = new QGraphicsTextItem(this);
                         newLabel->document()->setDocumentMargin(ChartPresenter::textMargin());
                         m_labels.append(newLabel);
                     }
                 }
                 if(themeManager()) themeManager()->updateSeries(m_series);
                 handleLayoutChanged();
                 handleVisibleChanged();
             }
             void AbstractBarChartItem::handleVisibleChanged()
             {
                 bool visible = m_series->isVisible();
                 if (visible)
                     handleLabelsVisibleChanged(m_series->isLabelsVisible());
                 else
                     handleLabelsVisibleChanged(visible);
                 foreach (QGraphicsItem *bar, m_bars)
                     bar->setVisible(visible);
             }
             void AbstractBarChartItem::handleOpacityChanged()
             {
                 foreach (QGraphicsItem *item, childItems())
                     item->setOpacity(m_series->opacity());
             }
             void AbstractBarChartItem::handleUpdatedBars()
             {
                 if (!m_series->d_func()->blockBarUpdate()) {
                     // Handle changes in pen, brush, labels etc.
                     int categoryCount = m_series->d_func()->categoryCount();
                     int setCount = m_series->count();
                     int itemIndex(0);
                     static const QString valueTag(QLatin1String("@value"));
                     for (int category = 0; category < categoryCount; category++) {
                         for (int set = 0; set < setCount; set++) {
                             QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
                             Bar *bar = m_bars.at(itemIndex);
                             bar->setPen(barSet->m_pen);
                             bar->setBrush(barSet->m_brush);
                             bar->update();
                             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);
                             label->setFont(barSet->m_labelFont);
                             label->setDefaultTextColor(barSet->m_labelBrush.color());
                             label->update();
                             itemIndex++;
                         }
                     }
                 }
             }
             void AbstractBarChartItem::handleLabelsPositionChanged()
             {
                 positionLabels();
             }
             void AbstractBarChartItem::positionLabels()
             {
                 // By default position labels on horizontal bar series
                 // Vertical bar series overload positionLabels() to call positionLabelsVertical()
                 QTransform transform;
                 const qreal angle = m_series->d_func()->labelsAngle();
                 if (angle != 0.0)
                     transform.rotate(angle);
                 for (int i = 0; i < m_layout.count(); i++) {
                     QGraphicsTextItem *label = m_labels.at(i);
                     QRectF labelRect = label->boundingRect();
                     QPointF center = labelRect.center();
                     qreal xPos = 0;
                     qreal yPos = m_layout.at(i).center().y() - center.y();
                     int xDiff = 0;
                     if (angle != 0.0) {
                         label->setTransformOriginPoint(center.x(), center.y());
                         label->setRotation(m_series->d_func()->labelsAngle());
                         qreal oldWidth = labelRect.width();
                         labelRect = transform.mapRect(labelRect);
                         xDiff = (labelRect.width() - oldWidth) / 2;
                     }
                     int offset = m_bars.at(i)->pen().width() / 2 + 2;
                     switch (m_series->labelsPosition()) {
                     case QAbstractBarSeries::LabelsCenter:
                         xPos = m_layout.at(i).center().x() - center.x();
                         break;
                     case QAbstractBarSeries::LabelsInsideEnd:
                         xPos = m_layout.at(i).right() - labelRect.width() - offset + xDiff;
                         break;
                     case QAbstractBarSeries::LabelsInsideBase:
                         xPos = m_layout.at(i).left() + offset + xDiff;
                         break;
                     case QAbstractBarSeries::LabelsOutsideEnd:
                         xPos = m_layout.at(i).right() + offset + xDiff;
                         break;
                     default:
                         // Invalid position, never comes here
                         break;
                     }
                     label->setPos(xPos, yPos);
                     label->setZValue(zValue() + 1);
                 }
             }
             void AbstractBarChartItem::positionLabelsVertical()
             {
                 QTransform transform;
                 const qreal angle = m_series->d_func()->labelsAngle();
                 if (angle != 0.0)
                     transform.rotate(angle);
                 for (int i = 0; i < m_layout.count(); i++) {
                     QGraphicsTextItem *label = m_labels.at(i);
                     QRectF labelRect = label->boundingRect();
                     QPointF center = labelRect.center();
                     qreal xPos = m_layout.at(i).center().x() - center.x();
                     qreal yPos = 0;
                     int yDiff = 0;
                     if (angle != 0.0) {
                         label->setTransformOriginPoint(center.x(), center.y());
                         label->setRotation(m_series->d_func()->labelsAngle());
                         qreal oldHeight = labelRect.height();
                         labelRect = transform.mapRect(labelRect);
                         yDiff = (labelRect.height() - oldHeight) / 2;
                     }
                     int offset = m_bars.at(i)->pen().width() / 2 + 2;
                     switch (m_series->labelsPosition()) {
                     case QAbstractBarSeries::LabelsCenter:
                         yPos = m_layout.at(i).center().y() - center.y();
                         break;
                     case QAbstractBarSeries::LabelsInsideEnd:
                         yPos = m_layout.at(i).top() + offset + yDiff;
                         break;
                     case QAbstractBarSeries::LabelsInsideBase:
                         yPos = m_layout.at(i).bottom() - labelRect.height() - offset + yDiff;
                         break;
                     case QAbstractBarSeries::LabelsOutsideEnd:
                         yPos = m_layout.at(i).top() - labelRect.height() - offset + yDiff;
                         break;
                     default:
                         // Invalid position, never comes here
                         break;
                     }
                     label->setPos(xPos, yPos);
                     label->setZValue(zValue() + 1);
                 }
             }
             #include "moc_abstractbarchartitem_p.cpp"
             QT_CHARTS_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/horizontalpercentbarchartitem_p.h>
             #include <private/qabstractbarseries_p.h>
             #include <private/qbarset_p.h>
             #include <private/bar_p.h>
             QT_CHARTS_BEGIN_NAMESPACE
             HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item)
                 : AbstractBarChartItem(series, item)
             {
             }
             void HorizontalPercentBarChartItem::initializeLayout()
             {
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
                 qreal barWidth = m_series->d_func()->barWidth();
                 m_layout.clear();
                 for(int category = 0; category < categoryCount; category++) {
                     for (int set = 0; set < setCount; set++) {
                         QRectF rect;
                         QPointF topLeft;
                         QPointF bottomRight;
                         if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2), m_validData);
                             bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2), m_validData);
                         } else {
                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2), m_validData);
                             bottomRight = domain()->calculateGeometryPoint(QPointF(0, category + barWidth / 2), m_validData);
                         }
                         if (!m_validData)
                              return;
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         m_layout.append(rect.normalized());
                     }
                 }
             }
             QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
                 qreal barWidth = m_series->d_func()->barWidth();
                 for(int category = 0; category < categoryCount; category++) {
                     qreal sum = 0;
                     qreal categorySum = m_series->d_func()->categorySum(category);
                     for (int set = 0; set < setCount; set++) {
                         qreal value = m_series->barSets().at(set)->at(category);
                         QRectF rect;
                         qreal topX = 0;
                         if (sum > 0)
                             topX = 100 * sum / categorySum;
                         qreal bottomX = 0;
                         qreal newSum = value + sum;
                         if (newSum > 0)
                             bottomX = 100 * newSum / categorySum;
                         QPointF topLeft;
                         if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? topX : domain()->minX(), category - barWidth/2), m_validData);
                         else
                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? topX : 0, category - barWidth/2), m_validData);
                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(bottomX, category + barWidth/2), m_validData);
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());
                         sum = newSum;
                     }
                 }
                 return layout;
             }
             void HorizontalPercentBarChartItem::handleUpdatedBars()
             {
                 // Handle changes in pen, brush, labels etc.
                 int categoryCount = m_series->d_func()->categoryCount();
                 int setCount = m_series->count();
                 int itemIndex(0);
                 static const QString valueTag(QLatin1String("@value"));
                 for (int category = 0; category < categoryCount; category++) {
                     for (int set = 0; set < setCount; set++) {
                         QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
                         Bar *bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->m_pen);
                         bar->setBrush(barSet->m_brush);
                         bar->update();
                         QGraphicsTextItem *label = m_labels.at(itemIndex);
                         qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;
                         QString vString(presenter()->numberToString(p, 'f', 0));
                         QString valueLabel;
-                        if (m_series->labelsFormat().isEmpty()) {
+                        if (p == 0) {
-                            vString.append(QStringLiteral("%"));
+                            label->setVisible(false);
-                            valueLabel = vString;
                         } else {
-                            valueLabel = m_series->labelsFormat();
+                            label->setVisible(true);
-                            valueLabel.replace(valueTag, vString);
+                            if (m_series->labelsFormat().isEmpty()) {
+                                vString.append(QStringLiteral("%"));
+                                valueLabel = vString;
+                            } else {
+                                valueLabel = m_series->labelsFormat();
+                                valueLabel.replace(valueTag, vString);
+                            }
                         }
                         label->setHtml(valueLabel);
                         label->setFont(barSet->m_labelFont);
                         label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();
                         itemIndex++;
                     }
                 }
             }
             #include "moc_horizontalpercentbarchartitem_p.cpp"
             QT_CHARTS_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <QtCharts/QBarSet>
             #include <private/qbarset_p.h>
             #include <private/charthelpers_p.h>
             #include <private/qchart_p.h>
             QT_CHARTS_BEGIN_NAMESPACE
             /*!
                 \class QBarSet
                 \inmodule Qt Charts
                 \brief Building block for different bar charts.
                 QBarSet represents one set of bars. Set of bars contains one data value for each category.
                 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
             */
             /*!
                 \qmltype BarSet
                 \instantiates QBarSet
                 \inqmlmodule QtCharts
                 \brief Building block for different bar charts.
                 BarSet represents one set of bars. Set of bars contains one data value for each category.
                 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
             */
             /*!
                 \property QBarSet::label
                 Defines the label of the bar set.
             */
             /*!
                 \qmlproperty string BarSet::label
                 Defines the label of the bar set.
             */
             /*!
                 \property QBarSet::pen
                 \brief Defines the pen used by the bar set.
             */
             /*!
                 \property QBarSet::brush
                 \brief Defines the brush used by the bar set.
             */
             /*!
                 \qmlproperty QString BarSet::brushFilename
                 The name of the file used as a brush for the set.
             */
             /*!
                 \property QBarSet::labelBrush
                 \brief Defines the brush used by the bar set's label.
             */
             /*!
                 \property QBarSet::labelFont
                 \brief Defines the font used by the bar set's label.
             */
             /*!
                 \qmlproperty Font BarSet::labelFont
                 Defines the font used by the bar set's label.
                 See the Qt documentation for more details of Font.
             */
             /*!
                 \property QBarSet::color
                 The fill (brush) color of the bar set.
             */
             /*!
                 \qmlproperty color BarSet::color
                 The fill (brush) color of the bar set.
             */
             /*!
                 \property QBarSet::borderColor
                 The line (pen) color of the bar set.
             */
             /*!
                 \qmlproperty color BarSet::borderColor
                 The line (pen) color of the bar set.
             */
             /*!
                 \qmlproperty real BarSet::borderWidth
                 The width of the border line. By default the width is 2.0.
             */
             /*!
                 \property QBarSet::labelColor
                 The text (label) color of the bar set.
             */
             /*!
                 \qmlproperty color BarSet::labelColor
                 The text (label) color of the bar set.
             */
             /*!
                 \fn void QBarSet::clicked(int index)
                 The signal is emitted if the user clicks with a mouse on top of bar set.
                 Clicked bar inside set is indexed by \a index
             */
             /*!
                 \fn void QBarSet::pressed(int index)
                 The signal is emitted if the user presses with a mouse on top of bar set.
                 Pressed bar inside set is indexed by \a index
             */
             /*!
                 \fn void QBarSet::released(int index)
                 The signal is emitted if the user releases with a mouse on top of bar set.
                 Released bar inside set is indexed by \a index
             */
             /*!
                 \fn void QBarSet::doubleClicked(int index)
                 The signal is emitted if the user doubleclicks with a mouse on top of bar set.
                 Doubleclicked bar inside set is indexed by \a index
             */
             /*!
                 \fn void QBarSet::hovered(bool status, int index)
                 The signal is emitted if mouse is hovered on top of bar set.
                 Parameter \a status is true, if mouse entered on top of bar set, false if mouse left from top of bar set.
                 Hovered bar inside the set is indexed by \a index.
             */
             /*!
                 \fn void QBarSet::labelChanged()
                 This signal is emitted when the label of the bar set has changed.
                 \sa label
             */
             /*!
                 \qmlsignal BarSet::onLabelChanged()
                 This signal is emitted when the label of the bar set has changed.
             */
             /*!
                 \fn void QBarSet::penChanged()
                 This signal is emitted when the pen of the bar set has changed.
                 \sa pen
             */
             /*!
                 \fn void QBarSet::brushChanged()
                 This signal is emitted when the brush of the bar set has changed.
                 \sa brush
             */
             /*!
                 \fn void QBarSet::labelBrushChanged()
                 This signal is emitted when the brush of the bar set's label has changed.
                 \sa labelBrush
             */
             /*!
                 \fn void QBarSet::labelFontChanged()
                 This signal is emitted when the font of the bar set's label has changed.
                 \sa labelBrush
             */
             /*!
                 \fn void QBarSet::colorChanged(QColor)
                 This signal is emitted when the fill (brush) color of the set has changed to \a color.
             */
             /*!
                 \qmlsignal BarSet::onColorChanged(color color)
                 This signal is emitted when the fill (brush) color of the set has changed to \a color.
             */
             /*!
                 \fn void QBarSet::borderColorChanged(QColor)
                 This signal is emitted when the line (pen) color of the set has changed to \a color.
             */
             /*!
                 \qmlsignal BarSet::onBorderColorChanged(color color)
                 This signal is emitted when the line (pen) color of the set has changed to \a color.
             */
             /*!
                 \fn void QBarSet::labelColorChanged(QColor)
                 This signal is emitted when the text (label) color of the set has changed to \a color.
             */
             /*!
                 \qmlsignal BarSet::onLabelColorChanged(color color)
                 This signal is emitted when the text (label) color of the set has changed to \a color.
             */
             /*!
                 \fn void QBarSet::valuesAdded(int index, int count)
                 This signal is emitted when new values have been added to the set.
                 Parameter \a index indicates the position of the first inserted value.
                 Parameter \a count is the number of inserted values.
                 \sa append(), insert()
             */
             /*!
                 \qmlsignal BarSet::onValuesAdded(int index, int count)
                 This signal is emitted when new values have been added to the set.
                 Parameter \a index indicates the position of the first inserted value.
                 Parameter \a count is the number of inserted values.
             */
             /*!
                 \fn void QBarSet::valuesRemoved(int index, int count)
                 This signal is emitted values have been removed from the set.
                 Parameter \a index indicates the position of the first removed value.
                 Parameter \a count is the number of removed values.
                 \sa remove()
             */
             /*!
                 \qmlsignal BarSet::onValuesRemoved(int index, int count)
                 This signal is emitted values have been removed from the set.
                 Parameter \a index indicates the position of the first removed value.
                 Parameter \a count is the number of removed values.
             */
             /*!
                 \fn void QBarSet::valueChanged(int index)
                 This signal is emitted values the value in the set has been modified.
                 Parameter \a index indicates the position of the modified value.
                 \sa at()
             */
             /*!
                 \qmlsignal BarSet::onValueChanged(int index)
                 This signal is emitted values the value in the set has been modified.
                 Parameter \a index indicates the position of the modified value.
             */
             /*!
                 \qmlproperty int BarSet::count
                 The count of values on the bar set
             */
             /*!
                 \qmlproperty QVariantList BarSet::values
                 The values of the bar set. You can set either a list of reals or a list of points as values. If you set a list of
                 reals as values, the values are automatically completed to points by using the index of a value as it's
                 x-coordinate. For example the following sets have equal values:
                 \code
                     myBarSet1.values = [0, 5, 1, 5];
                     myBarSet2.values = [Qt.point(0, 0), Qt.point(1, 5), Qt.point(2, 1), Qt.point(3, 5)];
                 \endcode
             */
             /*!
                 Constructs QBarSet with a label of \a label and with parent of \a parent.
             */
             QBarSet::QBarSet(const QString label, QObject *parent)
                 : QObject(parent),
                   d_ptr(new QBarSetPrivate(label, this))
             {
             }
             /*!
                 Destroys the bar set.
             */
             QBarSet::~QBarSet()
             {
                 // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 Sets new \a label for set.
             */
             void QBarSet::setLabel(const QString label)
             {
                 d_ptr->m_label = label;
                 emit labelChanged();
             }
             /*!
                 Returns label of the set.
             */
             QString QBarSet::label() const
             {
                 return d_ptr->m_label;
             }
             /*!
                 Appends new value \a value to the end of set.
             */
             void QBarSet::append(const qreal value)
             {
                 // Convert to QPointF
                 int index = d_ptr->m_values.count();
                 d_ptr->append(QPointF(d_ptr->m_values.count(), value));
                 emit valuesAdded(index, 1);
             }
             /*!
                 Appends a list of reals to set. Works like append with single real value. The \a values in list
                 are appended to end of bar set.
                 \sa append()
             */
             void QBarSet::append(const QList<qreal> &values)
             {
                 int index = d_ptr->m_values.count();
                 d_ptr->append(values);
                 emit valuesAdded(index, values.count());
             }
             /*!
                 Convenience operator. Same as append, with real \a value.
                 \sa append()
             */
             QBarSet &QBarSet::operator << (const qreal &value)
             {
                 append(value);
                 return *this;
             }
             /*!
                 Inserts new \a value on the \a index position.
                 The value that is currently at this postion is moved to position index + 1
                 \sa remove()
             */
             void QBarSet::insert(const int index, const qreal value)
             {
                 d_ptr->insert(index, value);
                 emit valuesAdded(index, 1);
             }
             /*!
                 Removes \a count number of values from the set starting at \a index.
                 \sa insert()
             */
             void QBarSet::remove(const int index, const int count)
             {
                 int removedCount = d_ptr->remove(index, count);
                 if (removedCount > 0)
                     emit valuesRemoved(index, removedCount);
                 return;
             }
             /*!
                 Sets a new value \a value to set, indexed by \a index.
             */
             void QBarSet::replace(const int index, const qreal value)
             {
                 if (index >= 0 && index < d_ptr->m_values.count()) {
                     d_ptr->replace(index, value);
                     emit valueChanged(index);
                 }
             }
             /*!
                 Returns value of set indexed by \a index.
                 If the index is out of bounds 0.0 is returned.
             */
             qreal QBarSet::at(const int index) const
             {
                 if (index < 0 || index >= d_ptr->m_values.count())
                     return 0;
                 return d_ptr->m_values.at(index).y();
             }
             /*!
                 Returns value of set indexed by \a index.
                 If the index is out of bounds 0.0 is returned.
             */
             qreal QBarSet::operator [](const int index) const
             {
                 return at(index);
             }
             /*!
                 Returns count of values in set.
             */
             int QBarSet::count() const
             {
                 return d_ptr->m_values.count();
             }
             /*!
                 Returns sum of all values in the bar set.
             */
             qreal QBarSet::sum() const
             {
                 qreal total(0);
                 for (int i = 0; i < d_ptr->m_values.count(); i++)
                     total += d_ptr->m_values.at(i).y();
                 return total;
             }
             /*!
                 Sets pen for set. Bars of this set are drawn using \a pen
             */
             void QBarSet::setPen(const QPen &pen)
             {
                 if (d_ptr->m_pen != pen) {
                     d_ptr->m_pen = pen;
                     emit d_ptr->updatedBars();
                     emit penChanged();
                 }
             }
             /*!
                 Returns pen of the set.
             */
             QPen QBarSet::pen() const
             {
                 if (d_ptr->m_pen == QChartPrivate::defaultPen())
                     return QPen();
                 else
                     return d_ptr->m_pen;
             }
             /*!
                 Sets brush for the set. Bars of this set are drawn using \a brush.
             */
             void QBarSet::setBrush(const QBrush &brush)
             {
                 if (d_ptr->m_brush != brush) {
                     d_ptr->m_brush = brush;
                     emit d_ptr->updatedBars();
                     emit brushChanged();
                 }
             }
             /*!
                 Returns brush of the set.
             */
             QBrush QBarSet::brush() const
             {
                 if (d_ptr->m_brush == QChartPrivate::defaultBrush())
                     return QBrush();
                 else
                     return d_ptr->m_brush;
             }
             /*!
                 Sets \a brush of the values that are drawn on top of this bar set.
             */
             void QBarSet::setLabelBrush(const QBrush &brush)
             {
                 if (d_ptr->m_labelBrush != brush) {
                     d_ptr->m_labelBrush = brush;
                     emit d_ptr->updatedBars();
                     emit labelBrushChanged();
                 }
             }
             /*!
                 Returns brush of the values that are drawn on top of this bar set.
             */
             QBrush QBarSet::labelBrush() const
             {
                 if (d_ptr->m_labelBrush == QChartPrivate::defaultBrush())
                     return QBrush();
                 else
                     return d_ptr->m_labelBrush;
             }
             /*!
                 Sets the \a font for values that are drawn on top of this bar set.
             */
             void QBarSet::setLabelFont(const QFont &font)
             {
                 if (d_ptr->m_labelFont != font) {
                     d_ptr->m_labelFont = font;
                     emit d_ptr->updatedBars();
                     emit labelFontChanged();
                 }
             }
             /*!
                 Returns the pen for values that are drawn on top of this bar set.
             */
             QFont QBarSet::labelFont() const
             {
                 return d_ptr->m_labelFont;
             }
             /*!
                 Returns the color of the brush of bar set.
             */
             QColor QBarSet::color()
             {
                 return brush().color();
             }
             /*!
                 Sets the \a color of brush for this bar set.
             */
             void QBarSet::setColor(QColor color)
             {
                 QBrush b = brush();
                 if ((b.color() != color) || (b.style() == Qt::NoBrush)) {
                     b.setColor(color);
                     if (b.style() == Qt::NoBrush) {
                         // Set tyle to Qt::SolidPattern. (Default is Qt::NoBrush)
                         // This prevents theme to override color defined in QML side:
                         // BarSet { label: "Bob"; color:"red"; values: [1,2,3] }
                         // The color must be obeyed, since user wanted it.
                         b.setStyle(Qt::SolidPattern);
                     }
                     setBrush(b);
                     emit colorChanged(color);
                 }
             }
             /*!
                 Returns the color of pen of this bar set.
             */
             QColor QBarSet::borderColor()
             {
                 return pen().color();
             }
             /*!
                 Sets the color of pen for this bar set.
             */
             void QBarSet::setBorderColor(QColor color)
             {
                 QPen p = pen();
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
                     emit borderColorChanged(color);
                 }
             }
             /*!
                 Returns the color of labels of this bar set.
             */
             QColor QBarSet::labelColor()
             {
                 return labelBrush().color();
             }
             /*!
                 Sets the color of labels for this bar set.
             */
             void QBarSet::setLabelColor(QColor color)
             {
                 QBrush b = labelBrush();
                 if (b == QBrush())
                     b.setStyle(Qt::SolidPattern);
                 if (d_ptr->m_labelBrush.color() != color) {
                     b.setColor(color);
                     setLabelBrush(b);
                     emit labelColorChanged(color);
                 }
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSetPrivate::QBarSetPrivate(const QString label, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
                 m_label(label),
                 m_pen(QChartPrivate::defaultPen()),
                 m_brush(QChartPrivate::defaultBrush()),
                 m_labelBrush(QChartPrivate::defaultBrush())
             {
             }
             QBarSetPrivate::~QBarSetPrivate()
             {
             }
             void QBarSetPrivate::append(QPointF value)
             {
                 if (isValidValue(value)) {
                     m_values.append(value);
                     emit restructuredBars();
                 }
             }
             void QBarSetPrivate::append(QList<QPointF> values)
             {
                 for (int i = 0; i < values.count(); i++) {
                     if (isValidValue(values.at(i)))
                         m_values.append(values.at(i));
                 }
                 emit restructuredBars();
             }
             void QBarSetPrivate::append(QList<qreal> values)
             {
                 int index = m_values.count();
                 for (int i = 0; i < values.count(); i++) {
                     if (isValidValue(values.at(i))) {
                         m_values.append(QPointF(index, values.at(i)));
                         index++;
                     }
                 }
                 emit restructuredBars();
             }
             void QBarSetPrivate::insert(const int index, const qreal value)
             {
                 m_values.insert(index, QPointF(index, value));
                 emit restructuredBars();
             }
             void QBarSetPrivate::insert(const int index, const QPointF value)
             {
                 m_values.insert(index, value);
                 emit restructuredBars();
             }
             int QBarSetPrivate::remove(const int index, const int count)
             {
                 int removeCount = count;
                 if ((index < 0) || (m_values.count() == 0))
                     return 0; // Invalid index or not values in list, remove nothing.
                 else if ((index + count) > m_values.count())
                     removeCount = m_values.count() - index; // Trying to remove more items than list has. Limit amount to be removed.
                 int c = 0;
                 while (c < removeCount) {
                     m_values.removeAt(index);
                     c++;
                 }
                 emit restructuredBars();
                 return removeCount;
             }
             void QBarSetPrivate::replace(const int index, const qreal value)
             {
                 m_values.replace(index, QPointF(index, value));
                 emit updatedLayout();
             }
             void QBarSetPrivate::replace(const int index, const QPointF value)
             {
                 m_values.replace(index, value);
                 emit updatedLayout();
             }
             qreal QBarSetPrivate::pos(const int index)
             {
                 if (index < 0 || index >= m_values.count())
                     return 0;
                 return m_values.at(index).x();
             }
             qreal QBarSetPrivate::value(const int index)
             {
                 if (index < 0 || index >= m_values.count())
                     return 0;
                 return m_values.at(index).y();
             }
             #include "moc_qbarset.cpp"
             #include "moc_qbarset_p.cpp"
             QT_CHARTS_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include <private/percentbarchartitem_p.h>
             #include <private/bar_p.h>
             #include <private/qabstractbarseries_p.h>
             #include <QtCharts/QBarSet>
             #include <private/qbarset_p.h>
             QT_CHARTS_BEGIN_NAMESPACE
             PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item) :
                 AbstractBarChartItem(series, item)
             {
                 connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
                         this, SLOT(handleLabelsPositionChanged()));
                 connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
             }
             void PercentBarChartItem::initializeLayout()
             {
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
                 qreal barWidth = m_series->d_func()->barWidth();
                 m_layout.clear();
                 for(int category = 0; category < categoryCount; category++) {
                     for (int set = 0; set < setCount; set++) {
                         QRectF rect;
                         QPointF topLeft;
                         QPointF bottomRight;
                         if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, domain()->minY()), m_validData);
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, domain()->minY()), m_validData);
                         } else {
                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, 0), m_validData);
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, 0), m_validData);
                         }
                         if (!m_validData)
                              return;
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         m_layout.append(rect.normalized());
                     }
                 }
             }
             QVector<QRectF> PercentBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
                 qreal barWidth = m_series->d_func()->barWidth();
                 for(int category = 0; category < categoryCount; category++) {
                     qreal sum = 0;
                     qreal categorySum = m_series->d_func()->categorySum(category);
                     for (int set = 0; set < setCount; set++) {
                         qreal value = m_series->barSets().at(set)->at(category);
                         QRectF rect;
                         qreal topY = 0;
                         qreal newSum = value + sum;
                         if (newSum > 0)
                             topY = 100 * newSum / categorySum;
                         qreal bottomY = 0;
                         if (sum > 0)
                             bottomY = 100 * sum / categorySum;
                         QPointF topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth/2, topY), m_validData);
                         QPointF bottomRight;
                         if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? bottomY : domain()->minY()), m_validData);
                         else
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? bottomY : 0), m_validData);
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());
                         sum = newSum;
                     }
                 }
                 return layout;
             }
             void PercentBarChartItem::handleUpdatedBars()
             {
                 // Handle changes in pen, brush, labels etc.
                 int categoryCount = m_series->d_func()->categoryCount();
                 int setCount = m_series->count();
                 int itemIndex(0);
                 static const QString valueTag(QLatin1String("@value"));
                 for (int category = 0; category < categoryCount; category++) {
                     for (int set = 0; set < setCount; set++) {
                         QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
                         Bar *bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->m_pen);
                         bar->setBrush(barSet->m_brush);
                         bar->update();
                         QGraphicsTextItem *label = m_labels.at(itemIndex);
                         qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;
                         QString vString(presenter()->numberToString(p, 'f', 0));
                         QString valueLabel;
-                        if (m_series->labelsFormat().isEmpty()) {
+                        if (p == 0) {
-                            vString.append(QStringLiteral("%"));
+                            label->setVisible(false);
-                            valueLabel = vString;
                         } else {
-                            valueLabel = m_series->labelsFormat();
+                            label->setVisible(true);
-                            valueLabel.replace(valueTag, vString);
+                            if (m_series->labelsFormat().isEmpty()) {
+                                vString.append(QStringLiteral("%"));
+                                valueLabel = vString;
+                            } else {
+                                valueLabel = m_series->labelsFormat();
+                                valueLabel.replace(valueTag, vString);
+                            }
                         }
                         label->setHtml(valueLabel);
                         label->setFont(barSet->m_labelFont);
                         label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();
                         itemIndex++;
                     }
                 }
             }
             void PercentBarChartItem::handleLabelsPositionChanged()
             {
                 positionLabels();
             }
             void PercentBarChartItem::positionLabels()
             {
                 positionLabelsVertical();
             }
             #include "moc_percentbarchartitem_p.cpp"
             QT_CHARTS_END_NAMESPACE

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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