HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2305:29e33b79f138

BarChartItems code cleanup

Marek Rosa -

r2305:29e33b79f138

parent child

Context file:

r2305:29e33b79f138

Collapse all files

src/barchart/abstractbarchartitem.cpp +9 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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 "abstractbaranimation_p.h"
             #include "chartdataset_p.h"
             #include <QPainter>
             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()));
                 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)
             {
                 if (m_animation) {
                     m_animation->setup(m_layout, layout);
                     presenter()->startAnimation(m_animation);
                 } else {
                     setLayout(layout);
                     update();
                 }
             }
             void AbstractBarChartItem::setAnimation(AbstractBarAnimation *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++)
+                for (int i = 0; i < m_bars.count(); i++) {
                     m_bars.at(i)->setRect(layout.at(i));
+                    QGraphicsSimpleTextItem *label = m_labels.at(i);
+                    label->setPos(layout.at(i).center() - label->boundingRect().center());
+                }
             }
             //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);
             }
             void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
             {
                 foreach (QGraphicsSimpleTextItem *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();
                 bool labelsVisible = m_series->isLabelsVisible();
                 // 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(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
                         connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
                         m_layout.append(QRectF(0, 0, 0, 0));
                         // Labels
                         QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(this);
                         label->setVisible(labelsVisible);
                         m_labels.append(label);
                     }
                 }
                 if(themeManager()) themeManager()->updateSeries(m_series);
                 handleLayoutChanged();
             }
             void AbstractBarChartItem::handleVisibleChanged()
             {
                 bool visible = m_series->isVisible();
                 handleLabelsVisibleChanged(visible);
                 foreach (QGraphicsItem *item, childItems())
                     item->setVisible(visible);
             }
             void AbstractBarChartItem::handleOpacityChanged()
             {
                 foreach (QGraphicsItem *item, childItems())
                     item->setOpacity(m_series->opacity());
             }
             void AbstractBarChartItem::handleUpdatedBars()
             {
                 // Handle changes in pen, brush, labels etc.
                 int categoryCount = m_series->d_func()->categoryCount();
                 int setCount = m_series->count();
                 int itemIndex(0);
                 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();
                         QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
+                        label->setText(QString("%1").arg(barSet->value(category)));
                         label->setFont(barSet->m_labelFont);
                         label->setBrush(barSet->m_labelBrush);
                         label->update();
                         itemIndex++;
                     }
                 }
             }
             #include "moc_abstractbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/abstractbarchartitem_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef ABSTRACTBARCHARTITEM_H
             #define ABSTRACTBARCHARTITEM_H
             #include "chartitem_p.h"
             #include "qabstractbarseries.h"
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Bar;
             class QAxisCategories;
             class QChart;
             class AbstractBarAnimation;
             class AbstractBarChartItem : public ChartItem
             {
                 Q_OBJECT
             public:
                 AbstractBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
                 virtual ~AbstractBarChartItem();
             public:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
                 virtual QVector<QRectF> calculateLayout() = 0;
                 virtual void applyLayout(const QVector<QRectF> &layout);
                 virtual void setAnimation(AbstractBarAnimation *animation);
                 void setLayout(const QVector<QRectF> &layout);
                 void updateLayout(const QVector<QRectF> &layout);
                 QRectF geometry() const { return m_rect;}
             public Q_SLOTS:
                 void handleDomainUpdated();
                 void handleLayoutChanged();
                 void handleLabelsVisibleChanged(bool visible);
                 void handleDataStructureChanged();     // structure of of series has changed, recreate graphic items
                 void handleVisibleChanged();
                 void handleOpacityChanged();
-                void handleUpdatedBars();
+                virtual void handleUpdatedBars();
             protected:
                 qreal m_domainMinX;
                 qreal m_domainMaxX;
                 qreal m_domainMinY;
                 qreal m_domainMaxY;
                 QRectF m_rect;
                 QVector<QRectF> m_layout;
                 AbstractBarAnimation *m_animation;
                 QAbstractBarSeries *m_series; // Not owned.
                 QList<Bar *> m_bars;
                 QList<QGraphicsSimpleTextItem *> m_labels;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // ABSTRACTBARCHARTITEM_H

src/barchart/horizontal/bar/horizontalbarchartitem.cpp +2 -63

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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 "horizontalbarchartitem_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset_p.h"
             #include "bar_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalBarChartItem::HorizontalBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item)
                 : AbstractBarChartItem(series, item)
             {
             }
             QVector<QRectF> HorizontalBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
-            //    bool barsVisible = m_series->isVisible();
                 qreal barWidth = m_series->d_func()->barWidth();
                 int itemIndex(0);
                 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;
-                        if (domain()->type() == AbstractDomain::LogXYDomain
+                        if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                || domain()->type() == AbstractDomain::LogXLogYDomain)
                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + (set + 1)/(setCount) * barWidth));
                         else
                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + (set + 1)/(setCount) * barWidth));
                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(value, category - barWidth / 2 + (set)/(setCount) * barWidth));
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect);
                         QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
+                        label->setPos(rect.center() - label->boundingRect().center());
                         label->setZValue(200);
                         itemIndex++;
-                        if (!qFuzzyCompare(value, 0))
-                            label->setText(QString::number(value));
-                        else
-                            label->setText(QString(""));
-            //            label->setFont(m_series->barSets().at(set)->labelFont());
-            //            label->setBrush(m_series->barSets().at(set)->labelBrush());
                         label->setBrush(Qt::black);
-                        label->setPos(rect.center() - label->boundingRect().center());
                     }
                 }
-            //    // AbstractDomain:
-            //    qreal width = geometry().width();
-            //    qreal height = geometry().height();
-            //    qreal rangeY = m_domainMaxY - m_domainMinY;
-            //    qreal rangeX = m_domainMaxX - m_domainMinX;
-            //    qreal scaleY = (height / rangeY);
-            //    qreal scaleX = (width / rangeX);
-            //    // On horizontal chart barWidth of the barseries means height of the rect.
-            //    qreal rectHeight = (scaleY / setCount) * m_series->d_func()->barWidth();
-            //    int itemIndex(0);
-            //    for (int category = 0; category < categoryCount; category++) {
-            //        qreal xPos = -scaleX * m_domainMinX + geometry().left();
-            //        for (int set = 0; set < setCount; set++) {
-            //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-            //            qreal yPos = geometry().bottom() + (m_domainMinY - barSet->pos(category)) * scaleY;
-            //            yPos += setCount * rectHeight / 2;
-            //            yPos -= set * rectHeight;
-            //            qreal rectWidth = barSet->value(category) * scaleX;
-            //            Bar *bar = m_bars.at(itemIndex);
-            //            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
-            //            layout.append(rect);
-            //            bar->setPen(barSet->m_pen);
-            //            bar->setBrush(barSet->m_brush);
-            //            if (qFuzzyCompare(rectHeight, 0))
-            //                bar->setVisible(false);
-            //            else
-            //                bar->setVisible(barsVisible);
-            //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-            //            if (!qFuzzyCompare(barSet->value(category), 0))
-            //                label->setText(QString::number(barSet->value(category)));
-            //            else
-            //                label->setText(QString(""));
-            //            label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-            //                          yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-            //            label->setFont(barSet->m_labelFont);
-            //            label->setBrush(barSet->m_labelBrush);
-            //            itemIndex++;
-            //        }
-            //    }
                 return layout;
             }
             #include "moc_horizontalbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +29 -56

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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 "horizontalpercentbarchartitem_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset_p.h"
             #include "bar_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item)
                 : AbstractBarChartItem(series, item)
             {
             }
             QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
-            //    bool barsVisible = m_series->isVisible();
                 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;
                         QPointF topLeft;
-                        if (domain()->type() == AbstractDomain::LogXYDomain
+                        if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                || domain()->type() == AbstractDomain::LogXLogYDomain)
                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : domain()->minX(), category + barWidth/2));
                         else
                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : 0, category + barWidth/2));
                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(100 * (value + sum)/categorySum, category - barWidth/2));
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect);
                         sum +=value;
                     }
                 }
+                return layout;
+            }
-            //    // AbstractDomain:
+            void HorizontalPercentBarChartItem::handleUpdatedBars()
-            //    qreal width = geometry().width();
-            //    qreal height = geometry().height();
+                // Handle changes in pen, brush, labels etc.
-            //    qreal rangeY = m_domainMaxY - m_domainMinY;
+                int categoryCount = m_series->d_func()->categoryCount();
-            //    qreal rangeX = m_domainMaxX - m_domainMinX;
+                int setCount = m_series->count();
-            //    qreal scaleY = (height / rangeY);
+                int itemIndex(0);
-            //    qreal scaleX = (width / rangeX);
-            //    qreal rectHeight = scaleY * m_series->d_func()->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
-            //    int itemIndex(0);
-            //    for (int category = 0; category < categoryCount; category++) {
-            //        qreal colSum = m_series->d_func()->categorySum(category);
-            //        qreal percentage = (100 / colSum);
-            //        qreal xPos = -scaleX * m_domainMinX + geometry().left();
-            //        for (int set = 0; set < setCount; set++) {
-            //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-            //            qreal yPos = (m_domainMinY + 0.5 - barSet->pos(category)) * scaleY + geometry().bottom() - rectHeight / 2;
-            //            qreal rectWidth = barSet->value(category) * percentage * scaleX;
-            //            Bar *bar = m_bars.at(itemIndex);
-            //            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
-            //            layout.append(rect);
-            //            bar->setPen(barSet->m_pen);
-            //            bar->setBrush(barSet->m_brush);
-            //            if (qFuzzyCompare(rectHeight, 0))
-            //                bar->setVisible(false);
-            //            else
-            //                bar->setVisible(barsVisible);
-            //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-            //            if (!qFuzzyCompare(m_series->d_func()->valueAt(set, category), 0)) {
-            //                int p = m_series->d_func()->percentageAt(set, category) * 100;
-            //                QString vString(QString::number(p));
-            //                vString.truncate(3);
-            //                vString.append("%");
-            //                label->setText(vString);
-            //            } else {
-            //                label->setText(QString(""));
-            //            }
-            //            label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-            //                          yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-            //            label->setFont(barSet->m_labelFont);
-            //            label->setBrush(barSet->m_labelBrush);
-            //            itemIndex++;
+                for (int category = 0; category < categoryCount; category++) {
-            //            xPos += rectWidth;
+                    for (int set = 0; set < setCount; set++) {
-            //        }
+                        QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-            //    }
+                        Bar *bar = m_bars.at(itemIndex);
-                return layout;
+                        bar->setPen(barSet->m_pen);
+                        bar->setBrush(barSet->m_brush);
+                        bar->update();
+                        QGraphicsSimpleTextItem *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("%");
+                        label->setText(vString);
+                        label->setFont(barSet->m_labelFont);
+                        label->setBrush(barSet->m_labelBrush);
+                        label->update();
+                        itemIndex++;
+                    }
+                }
             }
             #include "moc_horizontalpercentbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef HORIZONTALPERCENTBARCHARTITEM_P_H
             #define HORIZONTALPERCENTBARCHARTITEM_P_H
             #include "abstractbarchartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class HorizontalPercentBarChartItem : public AbstractBarChartItem
             {
                 Q_OBJECT
             public:
                 HorizontalPercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
+                void handleUpdatedBars();
             private:
                 virtual QVector<QRectF> calculateLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // HORIZONTALPERCENTBARCHARTITEM_P_H

src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +2 -60

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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 "horizontalstackedbarchartitem_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset_p.h"
             #include "bar_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalStackedBarChartItem::HorizontalStackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item)
                 : AbstractBarChartItem(series, item)
             {
             }
             QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
-            //    bool barsVisible = m_series->isVisible();
                 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(value + negativeSum, category - barWidth / 2));
-                            if (domain()->type() == AbstractDomain::LogXYDomain
+                            if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                    || domain()->type() == AbstractDomain::LogXLogYDomain)
                                 topLeft = domain()->calculateGeometryPoint(QPointF(set ? negativeSum : domain()->minX(), category + barWidth / 2));
                             else
                                 topLeft = domain()->calculateGeometryPoint(QPointF(set ? negativeSum : 0, category + barWidth / 2));
                             negativeSum += value;
                         } else {
                             bottomRight = domain()->calculateGeometryPoint(QPointF(value + positiveSum, category - barWidth / 2));
-                            if (domain()->type() == AbstractDomain::LogXYDomain
+                            if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                    || domain()->type() == AbstractDomain::LogXLogYDomain)
                                 topLeft = domain()->calculateGeometryPoint(QPointF(set ? positiveSum : domain()->minX(), category + barWidth / 2));
                             else
                                 topLeft = domain()->calculateGeometryPoint(QPointF(set ? positiveSum : 0, category + barWidth / 2));
                             positiveSum += value;
                         }
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect);
                     }
                 }
-                //    // AbstractDomain:
-                //    qreal width = geometry().width();
-                //    qreal height = geometry().height();
-                //    qreal rangeY = m_domainMaxY - m_domainMinY;
-                //    qreal rangeX = m_domainMaxX - m_domainMinX;
-                //    qreal scaleY = (height / rangeY);
-                //    qreal scaleX = (width / rangeX);
-                //    qreal rectHeight = scaleY * m_series->d_func()->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
-                //    int itemIndex(0);
-                //    for (int category = 0; category < categoryCount; category++) {
-                //        qreal xMax = -scaleX * m_domainMinX + geometry().left();
-                //        qreal xMin = -scaleX * m_domainMinX + geometry().left();
-                //        for (int set = 0; set < setCount; set++) {
-                //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                //            qreal yPos = (m_domainMinY + 0.5 - barSet->pos(category)) * scaleY + geometry().bottom() - rectHeight / 2;
-                //            qreal rectWidth = barSet->value(category) * scaleX;
-                //            Bar *bar = m_bars.at(itemIndex);
-                //            bar->setPen(barSet->m_pen);
-                //            bar->setBrush(barSet->m_brush);
-                //            if (qFuzzyCompare(rectHeight, 0))
-                //                bar->setVisible(false);
-                //            else
-                //                bar->setVisible(barsVisible);
-                //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-                //            if (!qFuzzyCompare(barSet->value(category), 0))
-                //                label->setText(QString::number(barSet->value(category)));
-                //            else
-                //                label->setText(QString(""));
-                //            label->setFont(barSet->m_labelFont);
-                //            label->setBrush(barSet->m_labelBrush);
-                //            if (rectWidth > 0) {
-                //                QRectF rect(xMax, yPos - rectHeight, rectWidth, rectHeight);
-                //                layout.append(rect);
-                //                label->setPos(xMax + (rect.width() / 2 - label->boundingRect().width() / 2),
-                //                              yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-                //                xMax += rectWidth;
-                //            } else {
-                //                QRectF rect(xMin, yPos - rectHeight, rectWidth, rectHeight);
-                //                layout.append(rect);
-                //                label->setPos(xMin + (rect.width() / 2 - label->boundingRect().width() / 2),
-                //                              yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-                //                xMin += rectWidth;
-                //            }
-                //            itemIndex++;
-                //        }
-                //    }
                 return layout;
             }
             #include "moc_horizontalstackedbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/bar/barchartitem.cpp +1 -67

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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)
             {
             }
             QVector<QRectF> BarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
-            //    bool barsVisible = m_series->isVisible();
                 qreal barWidth = m_series->d_func()->barWidth();
-                //    barWidth = 1.8;
-                int itemIndex(0);
                 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));
                         QPointF bottomRight;
-                        if (domain()->type() == AbstractDomain::XLogYDomain
+                        if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                || domain()->type() == AbstractDomain::LogXLogYDomain)
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, domain()->minY()));
                         else
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0));
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect);
-                        QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-                        label->setZValue(200);
-                        itemIndex++;
-                        if (!qFuzzyCompare(value, 0))
-                            label->setText(QString::number(value));
-                        else
-                            label->setText(QString(""));
-            //            label->setFont(m_series->barSets().at(set)->labelFont());
-            //            label->setBrush(m_series->barSets().at(set)->labelBrush());
-                        label->setBrush(Qt::black);
-                        label->setPos(rect.center() - label->boundingRect().center());
                     }
                 }
-                // AbstractDomain:
-                //    qreal width = geometry().width();
-                //    qreal height = geometry().height();
-                //    qreal rangeY = m_domainMaxY - m_domainMinY;
-                //    qreal rangeX = m_domainMaxX - m_domainMinX;
-                //    qreal scaleY = (height / rangeY);
-                //    qreal scaleX = (width / rangeX);
-                //    qreal rectWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
-                //    int itemIndex(0);
-                //    for (int category = 0; category < categoryCount; category++) {
-                //        qreal yPos = height + scaleY * m_domainMinY + geometry().top();
-                //        for (int set = 0; set < setCount; set++) {
-                //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-                //            qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left();
-                //            xPos -= setCount * rectWidth / 2;
-                //            xPos += set * rectWidth;barWidth / 2
-                //            qreal rectHeight = barSet->value(category) * scaleY;
-                //            Bar *bar = m_bars.at(itemIndex);
-                //            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
-                //            layout.append(rect);
-                //            bar->setPen(barSet->m_pen);
-                //            bar->setBrush(barSet->m_brush);
-                //            if (qFuzzyIsNull(rectHeight))
-                //                bar->setVisible(false);
-                //            else
-                //                bar->setVisible(barsVisible);
-                //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-                //            if (!qFuzzyIsNull(barSet->value(category)))
-                //                label->setText(QString::number(barSet->value(category)));
-                //            else
-                //                label->setText(QString(""));
-                //            label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-                //                          yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-                //            label->setFont(barSet->m_labelFont);
-                //            label->setBrush(barSet->m_labelBrush);
-                //            itemIndex++;
-                //        }
-                //    }
                 return layout;
             }
             #include "moc_barchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/percent/percentbarchartitem.cpp +30 -57

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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)
             {
             }
             QVector<QRectF> PercentBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
-            //    bool barsVisible = m_series->isVisible();
                 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;
                         QPointF topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth/2, 100 * (value + sum)/categorySum));
                         QPointF bottomRight;
-                        if (domain()->type() == AbstractDomain::XLogYDomain
+                        if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                || domain()->type() == AbstractDomain::LogXLogYDomain)
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? 100 * sum/categorySum : domain()->minY()));
                         else
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? 100 * sum/categorySum : 0));
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect);
                         sum +=value;
                     }
                 }
+                return layout;
+            }
-                // AbstractDomain:
+            void PercentBarChartItem::handleUpdatedBars()
-            //    qreal width = geometry().width();
-            //    qreal height = geometry().height();
+                // Handle changes in pen, brush, labels etc.
-            //    qreal rangeY = m_domainMaxY - m_domainMinY;
+                int categoryCount = m_series->d_func()->categoryCount();
-            //    qreal rangeX = m_domainMaxX - m_domainMinX;
+                int setCount = m_series->count();
-            //    qreal scaleY = (height / rangeY);
+                int itemIndex(0);
-            //    qreal scaleX = (width / rangeX);
-            //    qreal rectWidth = scaleX * m_series->d_func()->barWidth();
-            //    int itemIndex(0);
-            //    for (int category = 0; category < categoryCount; category++) {
-            //        qreal colSum = m_series->d_func()->categorySum(category);
-            //        qreal percentage = (100 / colSum);
-            //        qreal yPos = height + scaleY * m_domainMinY + geometry().top();
-            //        for (int set = 0; set < setCount; set++) {
-            //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-            //            qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left() - rectWidth / 2;
-            //            qreal rectHeight = barSet->value(category) * percentage * scaleY;
-            //            Bar *bar = m_bars.at(itemIndex);
-            //            bar->setPen(barSet->m_pen);
-            //            bar->setBrush(barSet->m_brush);
-            //            if (qFuzzyIsNull(rectHeight))
-            //                bar->setVisible(false);
-            //            else
-            //                bar->setVisible(barsVisible);
-            //            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
-            //            layout.append(rect);
-            //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-            //            if (!qFuzzyIsNull(m_series->d_func()->valueAt(set, category))) {
-            //                int p = m_series->d_func()->percentageAt(set, category) * 100;
-            //                QString vString(QString::number(p));
-            //                vString.truncate(3);
-            //                vString.append("%");
-            //                label->setText(vString);
-            //            } else {
-            //                label->setText(QString(""));
-            //            }
-            //            label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-            //                          yPos - rectHeight / 2 - label->boundingRect().height() / 2);
-            //            label->setFont(barSet->m_labelFont);
-            //            label->setBrush(barSet->m_labelBrush);
-            //            itemIndex++;
+                for (int category = 0; category < categoryCount; category++) {
-            //            yPos -= rectHeight;
+                    for (int set = 0; set < setCount; set++) {
-            //        }
+                        QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-            //    }
+                        Bar *bar = m_bars.at(itemIndex);
-                return layout;
+                        bar->setPen(barSet->m_pen);
+                        bar->setBrush(barSet->m_brush);
+                        bar->update();
+                        QGraphicsSimpleTextItem *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("%");
+                        label->setText(vString);
+                        label->setFont(barSet->m_labelFont);
+                        label->setBrush(barSet->m_labelBrush);
+                        label->update();
+                        itemIndex++;
+                    }
+                }
             }
             #include "moc_percentbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/percent/percentbarchartitem_p.h +2 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef PERCENTBARCHARTITEM_H
             #define PERCENTBARCHARTITEM_H
             #include "abstractbarchartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractBarSeries;
             class PercentBarChartItem : public AbstractBarChartItem
             {
                 Q_OBJECT
             public:
                 PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
+                void handleUpdatedBars();
             private:
                 virtual QVector<QRectF> calculateLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PERCENTBARCHARTITEM_H

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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)
             {
             }
             QVector<QRectF> StackedBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->count();
-            //    bool barsVisible = m_series->isVisible();
                 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));
-                            if (domain()->type() == AbstractDomain::XLogYDomain
+                            if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                    || domain()->type() == AbstractDomain::LogXLogYDomain)
                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : domain()->minY()));
                             else
                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : 0));
                             negativeSum += value;
                         } else {
                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + positiveSum));
-                            if (domain()->type() == AbstractDomain::XLogYDomain
+                            if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                    || domain()->type() == AbstractDomain::LogXLogYDomain)
                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : domain()->minY()));
                             else
                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0));
                             positiveSum += value;
                         }
                         rect.setTopLeft(topLeft);
                         rect.setBottomRight(bottomRight);
                         layout.append(rect);
                     }
                 }
+                return layout;
-            // AbstractDomain:
-            //    qreal width = geometry().width();
-            //    qreal height = geometry().height();
-            //    qreal rangeY = m_domainMaxY - m_domainMinY;
-            //    qreal rangeX = m_domainMaxX - m_domainMinX;
-            //    qreal scaleY = (height / rangeY);
-            //    qreal scaleX = (width / rangeX);
-            //    qreal rectWidth = scaleX * m_series->d_func()->barWidth();
-            //    int itemIndex(0);
-            //    for (int category = 0; category < categoryCount; category++) {
-            //        qreal yMax = height + scaleY * m_domainMinY + geometry().top();
-            //        qreal yMin = height + scaleY * m_domainMinY + geometry().top();
-            //        for (int set = 0; set < setCount; set++) {
-            //            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
-            //            qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left() - rectWidth / 2;
-            //            qreal rectHeight = barSet->value(category) * scaleY;
-            //            Bar *bar = m_bars.at(itemIndex);
-            //            bar->setPen(barSet->m_pen);
-            //            bar->setBrush(barSet->m_brush);
-            //            if (qFuzzyIsNull(rectHeight))
-            //                bar->setVisible(false);
-            //            else
-            //                bar->setVisible(barsVisible);
-            //            QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-            //            if (!qFuzzyIsNull(barSet->value(category)))
-            //                label->setText(QString::number(barSet->value(category)));
-            //            else
-            //                label->setText(QString(""));
-            //            label->setFont(barSet->m_labelFont);
-            //            label->setBrush(barSet->m_labelBrush);
-            //            if (rectHeight < 0) {
-            //                QRectF rect(xPos, yMax - rectHeight, rectWidth, rectHeight);
-            //                layout.append(rect);
-            //                label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-            //                              yMax - rectHeight / 2 - label->boundingRect().height() / 2);
-            //                yMax -= rectHeight;
-            //            } else {
-            //                QRectF rect(xPos, yMin - rectHeight, rectWidth, rectHeight);
-            //                layout.append(rect);
-            //                label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
-            //                              yMin - rectHeight / 2 - label->boundingRect().height() / 2);
-            //                yMin -= rectHeight;
-            //            }
-            //            itemIndex++;
-            //        }
-            //    }
-            return layout;
             }
             #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