HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r850:ce48b0dbab03

percent barchart layout fix. signal fix

sauimone -

r850:ce48b0dbab03

parent child

Context file:

r850:ce48b0dbab03

Collapse all files

src/barchart/barchartitem.cpp +11 -12

             {
                 connect(series, SIGNAL(showToolTip(QPoint,QString)), this, SLOT(showToolTip(QPoint,QString)));
                 connect(series, SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
-                connect(series, SIGNAL(restructuredBar(int)), this, SLOT(handleModelChanged(int)));
+                connect(series, SIGNAL(restructuredBars()), this, SLOT(handleModelChanged()));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 dataChanged();
             }
             {
                 QVector<QRectF> layout;
-                // Use temporary qreals for accurancy (we might get some compiler warnings... :)
+                // Use temporary qreals for accurancy
                 qreal categoryCount = m_series->categoryCount();
                 qreal setCount = m_series->barsetCount();
+                // Domain:
                 qreal width = geometry().width();
                 qreal height = geometry().height();
+                qreal range = m_domainMaxY - m_domainMinY;
-                qreal max = m_series->max();
+                qreal scale = (height / range);
-                // Domain:
-                if (m_domainMaxY > max) {
-                    max = m_domainMaxY;
-                qreal scale = (height / max);
                 qreal categoryWidth = width / categoryCount;
                 qreal barWidth = categoryWidth / (setCount+1);
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
                     qreal xPos = categoryWidth * category + barWidth / 2;
-                    qreal yPos = height;
+                    qreal yPos = height + scale * m_domainMinY;
                     for (int set = 0; set < setCount; set++) {
                         QBarSet* barSet = m_series->barsetAt(set);
             void BarChartItem::handleGeometryChanged(const QRectF &rect)
             {
+                prepareGeometryChange();
                 m_clipRect = rect.translated(-rect.topLeft());
                 m_rect = rect;
                 handleLayoutChanged();
             void BarChartItem::handleLayoutChanged()
             {
+                if ((m_rect.width() <= 0) || (m_rect.height() <= 0)) {
+                    // rect size zero.
+                    return;
+                }
                 QVector<QRectF> layout = calculateLayout();
                 applyLayout(layout);
                 update();

src/barchart/barchartmodel.cpp +12 -1

                 return value / total;
             }
             qreal BarChartModel::categorySum(int category) const
             {
                 qreal sum(0);
                 return sum;
             }
+            qreal BarChartModel::absoluteCategorySum(int category) const
+            {
+                qreal sum(0);
+                int count = m_dataModel.count(); // Count sets
+                for (int set = 0; set < count; set++) {
+                    if (category < m_dataModel.at(set)->count())
+                        sum += qAbs(m_dataModel.at(set)->valueAt(category));
+                }
+                return sum;
+            }
             qreal BarChartModel::maxCategorySum() const
             {
                 qreal max = INT_MIN;

src/barchart/barchartmodel_p.h +1 0

                 qreal percentageAt(int set, int category) const;
                 qreal categorySum(int category) const;
+                qreal absoluteCategorySum(int category) const;
                 qreal maxCategorySum() const;     // returns maximum sum of sets in all categories.
                 QString categoryName(int category);

src/barchart/percentbarchartitem.cpp +7 -3

             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "qbarset.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 qreal xStep = width / categoryCount;
                 qreal xPos =  xStep / 2 - barWidth / 2;
+                qreal range = m_domainMaxY - m_domainMinY;
+                qreal domainScale = (height / range);
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
                     qreal colSum = m_series->categorySum(category);
-                    qreal scale = (height / colSum);
+                    qreal percentage = (100 / colSum);
-                    qreal yPos = height;
+                    qreal yPos = height + domainScale * m_domainMinY;
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         QBarSet* barSet = m_series->barsetAt(set);
-                        qreal barHeight = barSet->valueAt(category) * scale;
+                        qreal barHeight = barSet->valueAt(category) * percentage * domainScale;
                         Bar* bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());

src/barchart/qbarseries.cpp +41 -4

                 m_internalModel->appendBarSet(set);
                 connect(set, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
                 connect(set, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
-                emit updatedBars();
+                emit restructuredBars();
             }
             /*!
             {
                 disconnect(set, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
                 m_internalModel->removeBarSet(set);
-                emit updatedBars();
+                emit restructuredBars();
+            }
+            /*!
+                Adds a list of barsets to series. Takes ownership of \a sets.
+                Connects the clicked(QString, Qt::MouseButtons) signals
+                of \a sets to this series
+            */
+            void QBarSeries::appendBarSets(QList<QBarSet* > sets)
+            {
+                foreach (QBarSet* barset, sets) {
+                    m_internalModel->appendBarSet(barset);
+                    connect(barset, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
+                    connect(barset, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
+                }
+                emit restructuredBars();
+            }
+            /*!
+                Removes a list of barsets from series. Releases ownership of \a set. Doesnt delete \a sets.
+                Disconnects the clicked(QString, Qt::MouseButtons) signal
+                of \a sets from this series
+            */
+            void QBarSeries::removeBarSets(QList<QBarSet* > sets)
+            {
+                foreach (QBarSet* barset, sets) {
+                    disconnect(barset, SIGNAL(clicked(QString,Qt::MouseButtons)), this, SLOT(barsetClicked(QString,Qt::MouseButtons)));
+                    m_internalModel->removeBarSet(barset);
+                }
+                emit restructuredBars();
             }
             void QBarSeries::insertBarSet(int i, QBarSet *set)
             }
             /*!
+                \internal \a category
+            */
+            qreal QBarSeries::absoluteCategorySum(int category)
+            {
+                return m_internalModel->absoluteCategorySum(category);
+            }
+            /*!
                 \internal
             */
             qreal QBarSeries::maxCategorySum()
                         barsetAt(i)->insertValue(start - m_mapFirst, m_model->data(m_model->index(i, start), Qt::DisplayRole).toDouble());
                     }
                 }
-                emit restructuredBar(1);
+                emit restructuredBars();
             }
             void QBarSeries::modelDataRemoved(QModelIndex parent, int start, int end)
                 {
                     barsetAt(i)->removeValue(start - m_mapFirst);
                 }
-                emit restructuredBar(1);
+                emit restructuredBars();
             }
             void QBarSeries::barsetChanged()

src/barchart/qbarseries.h +5 -2

                 virtual QSeriesType type() const { return QSeries::SeriesTypeBar; }
-                void appendBarSet(QBarSet *set);               // Takes ownership of set
+                void appendBarSet(QBarSet *set);            // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
+                void appendBarSets(QList<QBarSet* > sets);
+                void removeBarSets(QList<QBarSet* > sets);
                 void insertBarSet(int i, QBarSet *set);
                 void insertCategory(int i, QString category);
                 void removeCategory(int i);
                 qreal valueAt(int set, int category);
                 qreal percentageAt(int set, int category);
                 qreal categorySum(int category);
+                qreal absoluteCategorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
                 // <--- TO PIMPL
                 //
                 void updatedBars();
-                void restructuredBar(int);
+                void restructuredBars();
                 // TODO: internal signals, these to private implementation.
                 // TODO: TO PIMPL --->

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