HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2697:899dd6266dee

Fix bar value label position...

Titta Heikkala -

r2697:899dd6266dee

parent child

Context file:

r2697:899dd6266dee

Collapse all files

src/barchart/abstractbarchartitem.cpp +4 -3

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Enterprise Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Enterprise licenses may use this file in
             ** accordance with the Qt Enterprise License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "abstractbarchartitem_p.h"
             #include "bar_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "qabstractbarseries.h"
             #include "qabstractbarseries_p.h"
             #include "qchart.h"
             #include "chartpresenter_p.h"
             #include "charttheme_p.h"
             #include "baranimation_p.h"
             #include "chartdataset_p.h"
             #include <QPainter>
             #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item) :
                 ChartItem(series->d_func(),item),
                 m_animation(0),
                 m_series(series)
             {
                 setFlag(ItemClipsChildrenToShape);
                 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()));
                 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,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));
                         connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), m_series, SIGNAL(hovered(bool, int, QBarSet*)));
                         connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
                         connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
                         connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), set, SIGNAL(hovered(bool, 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 (m_series->labelsFormat().isEmpty()) {
                                 valueLabel = QString("%1").arg(barSet->value(category));
                             } else {
                                 valueLabel = m_series->labelsFormat();
                                 valueLabel.replace(valueTag, QString::number(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()
             {
                 for (int i = 0; i < m_layout.count(); i++) {
                     QGraphicsTextItem *label = m_labels.at(i);
                     qreal xPos = 0;
                     qreal yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
+                    int offset = m_bars.at(i)->pen().width() / 2 + 2;
                     if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
                         xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
-                        xPos = m_layout.at(i).right() - label->boundingRect().width();
+                        xPos = m_layout.at(i).right() - label->boundingRect().width() - offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
-                        xPos = m_layout.at(i).left();
+                        xPos = m_layout.at(i).left() + offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
-                        xPos = m_layout.at(i).right();
+                        xPos = m_layout.at(i).right() + offset;
                     label->setPos(xPos, yPos);
                     label->setZValue(zValue() + 1);
                 }
             }
             #include "moc_abstractbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/bar/barchartitem.cpp +4 -3

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Enterprise Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Enterprise licenses may use this file in
             ** accordance with the Qt Enterprise License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "barchartitem_p.h"
             #include "bar_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartItem::BarChartItem(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 BarChartItem::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 + set/setCount * barWidth, domain()->minY()), m_validData);
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/setCount * barWidth, domain()->minY()), m_validData);
                         } else {
                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + set/setCount * barWidth, 0), m_validData);
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/setCount * barWidth, 0), m_validData);
                         }
                         if (!m_validData)
                              return;
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         m_layout.append(rect.normalized());
                     }
                 }
             }
             QVector<QRectF> BarChartItem::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++) {
                     for (int set = 0; set < setCount; set++) {
                         qreal value = m_series->barSets().at(set)->at(category);
                         QRectF rect;
                         QPointF topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set)/(setCount) * barWidth, value), m_validData);
                         QPointF bottomRight;
                         if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, domain()->minY()), m_validData);
                         else
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0), m_validData);
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());
                     }
                 }
                 return layout;
             }
             void BarChartItem::handleLabelsPositionChanged()
             {
                 positionLabels();
             }
             void BarChartItem::positionLabels()
             {
                 for (int i = 0; i < m_layout.count(); i++) {
                     QGraphicsTextItem *label = m_labels.at(i);
                     qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
                     qreal yPos = 0;
+                    int offset = m_bars.at(i)->pen().width() / 2 + 2;
                     if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
                         yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
-                        yPos = m_layout.at(i).top();
+                        yPos = m_layout.at(i).top() - offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
-                        yPos = m_layout.at(i).bottom() - label->boundingRect().height();
+                        yPos = m_layout.at(i).bottom() - label->boundingRect().height() + offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
-                        yPos = m_layout.at(i).top() - label->boundingRect().height();
+                        yPos = m_layout.at(i).top() - label->boundingRect().height() + offset;
                     label->setPos(xPos, yPos);
                     label->setZValue(zValue() + 1);
                 }
             }
             #include "moc_barchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/percent/percentbarchartitem.cpp +4 -3

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Enterprise Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Enterprise licenses may use this file in
             ** accordance with the Qt Enterprise License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "percentbarchartitem_p.h"
             #include "bar_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             QTCOMMERCIALCHART_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);
                         int p = m_series->d_func()->percentageAt(set, category) * 100;
                         QString vString(QString::number(p));
                         vString.truncate(3);
                         vString.append("%");
                         QString valueLabel;
                         if (m_series->labelsFormat().isEmpty()) {
                             valueLabel = vString;
                         } else {
                             valueLabel = m_series->labelsFormat();
                             valueLabel.replace(valueTag, QString::number(barSet->value(category)));
                         }
                         label->setHtml(valueLabel);
                         label->setFont(barSet->m_labelFont);
                         label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();
                         itemIndex++;
                     }
                 }
             }
             void PercentBarChartItem::handleLabelsPositionChanged()
             {
                 positionLabels();
             }
             void PercentBarChartItem::positionLabels()
             {
                 for (int i = 0; i < m_layout.count(); i++) {
                     QGraphicsTextItem *label = m_labels.at(i);
                     qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
                     qreal yPos = 0;
+                    int offset = m_bars.at(i)->pen().width() / 2 + 2;
                     if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
                         yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
-                        yPos = m_layout.at(i).top();
+                        yPos = m_layout.at(i).top() - offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
-                        yPos = m_layout.at(i).bottom() - label->boundingRect().height();
+                        yPos = m_layout.at(i).bottom() - label->boundingRect().height() + offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
-                        yPos = m_layout.at(i).top() - label->boundingRect().height();
+                        yPos = m_layout.at(i).top() - label->boundingRect().height() + offset;
                     label->setPos(xPos, yPos);
                     label->setZValue(zValue() + 1);
                 }
             }
             #include "moc_percentbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/stacked/stackedbarchartitem.cpp +4 -3

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Enterprise Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Enterprise licenses may use this file in
             ** accordance with the Qt Enterprise License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "stackedbarchartitem_p.h"
             #include "bar_p.h"
             #include "qbarset_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarChartItem::StackedBarChartItem(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 StackedBarChartItem::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> StackedBarChartItem::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 positiveSum = 0;
                     qreal negativeSum = 0;
                     for (int set = 0; set < setCount; set++) {
                         qreal value = m_series->barSets().at(set)->at(category);
                         QRectF rect;
                         QPointF topLeft;
                         QPointF bottomRight;
                         if (value < 0) {
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + negativeSum), m_validData);
                             if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : domain()->minY()), m_validData);
                             else
                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : 0), m_validData);
                             negativeSum += value;
                         } else {
                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + positiveSum), m_validData);
                             if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
                                 bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : domain()->minY()), m_validData);
                             else
                                 bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0), m_validData);
                             positiveSum += value;
                         }
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect.normalized());
                     }
                 }
                 return layout;
             }
             void StackedBarChartItem::handleLabelsPositionChanged()
             {
                 positionLabels();
             }
             void StackedBarChartItem::positionLabels()
             {
                 for (int i = 0; i < m_layout.count(); i++) {
                     QGraphicsTextItem *label = m_labels.at(i);
                     qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
                     qreal yPos = 0;
+                    int offset = m_bars.at(i)->pen().width() / 2 + 2;
                     if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
                         yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
-                        yPos = m_layout.at(i).top();
+                        yPos = m_layout.at(i).top() - offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
-                        yPos = m_layout.at(i).bottom() - label->boundingRect().height();
+                        yPos = m_layout.at(i).bottom() - label->boundingRect().height() + offset;
                     else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
-                        yPos = m_layout.at(i).top() - label->boundingRect().height();
+                        yPos = m_layout.at(i).top() - label->boundingRect().height() + offset;
                     label->setPos(xPos, yPos);
                     label->setZValue(zValue() + 1);
                 }
             }
             #include "moc_stackedbarchartitem_p.cpp"
             QTCOMMERCIALCHART_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