HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r163:daab1c215b03

Make pie work better with chartwidgettest

Jani Honkonen -

r163:daab1c215b03

parent child

Context file:

r163:daab1c215b03

Collapse all files

src/chartpresenter.cpp +2 -3

                         break;
                     }
                     case QChartSeries::SeriesTypePie: {
-                        QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
+                        QPieSeries *s = qobject_cast<QPieSeries *>(series);
-                        PiePresenter* pie = new PiePresenter(m_chart, pieSeries);
+                        PiePresenter* pie = new PiePresenter(m_chart, s);
-                        QObject::connect(pieSeries, SIGNAL(changed(const PieChangeSet&)), pie, SLOT(handleSeriesChanged(const PieChangeSet&)));
                         QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), pie, SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset, SIGNAL(domainChanged(const Domain&)), pie, SLOT(handleDomainChanged(const Domain&)));
                         m_chartItems.insert(series, pie);

src/charttheme.cpp +20 0

             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
             #include "qlinechartseries.h"
+            #include "qpieseries.h"
             //items
             #include "axisitem_p.h"
             #include "bargroup.h"
             #include "stackedbargroup.h"
             #include "linechartitem_p.h"
             #include "percentbargroup.h"
+            #include "piepresenter.h"
             //themes
             #include "chartthemevanilla_p.h"
                         decorate(i,s,count);
                         break;
                     }
+                    case QChartSeries::SeriesTypePie: {
+                        QPieSeries* s = static_cast<QPieSeries*>(series);
+                        PiePresenter* i = static_cast<PiePresenter*>(item);
+                        decorate(i,s,count);
+                        break;
+                    }
                     default:
                     qDebug()<<"Wrong item to be decorated by theme";
                     break;
                 item->addColor(QColor(255,128,0,128));
             }
+            void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int /*count*/)
+            {
+                // TODO: Does not work well. We need to generate enough different colors
+                // based on available theme and not use the same color twice.
+                for (int i=0; i<series->count(); i++) {
+                    QPieSlice slice = series->slice(i);
+                    slice.m_color = m_seriesColor.at(i % m_seriesColor.count());
+                    series->update(i, slice);
+                }
+            }
             QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme_p.h +3 0

             class StackedBarChartSeries;
             class PercentBarChartSeries;
             class PercentBarGroup;
+            class PiePresenter;
+            class QPieSeries;
             class ChartTheme
             {
                 void decorate(BarGroup* item, BarChartSeries* series,int count);
                 void decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count);
                 void decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count);
+                void decorate(PiePresenter* item, QPieSeries* series, int count);
             protected:
                 QChart::ChartTheme m_id;

src/piechart/piepresenter.cpp +18 -4

             #include "piepresenter.h"
             #include "pieslice.h"
             #include <QDebug>
+            #include <QTime>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 Q_ASSERT(parent);
                 Q_ASSERT(series);
                 m_rect = parentItem()->boundingRect();
                 setAcceptHoverEvents(true);
+                qsrand(QTime::currentTime().msec()); // for random color generation
+                connect(series, SIGNAL(changed(const PieChangeSet&)), this, SLOT(handleSeriesChanged(const PieChangeSet&)));
+                connect(series, SIGNAL(sizeFactorChanged()), this, SLOT(updateGeometry()));
+                connect(series, SIGNAL(positionChanged()), this, SLOT(updateGeometry()));
             }
             PiePresenter::~PiePresenter()
                     delete m_slices.takeLast();
             }
-            void PiePresenter::handleSeriesChanged(const PieChangeSet& changeSet)
+            void PiePresenter::handleSeriesChanged(const PieChangeSet& /*changeSet*/)
             {
                 const qreal fullPie = 360;
                 qreal total = 0;
-                // calculate total
+                // calculate total and set random color if there is no color
-                foreach (QPieSlice sliceData, m_pieSeries->slices())
+                for (int i=0; i<m_pieSeries->count(); i++) {
-                    total += sliceData.m_value;
+                    QPieSlice& slice = m_pieSeries->m_slices[i];
+                    total += slice.m_value;
+                    if  (slice.m_color == QColor::Invalid) {
+                        slice.m_color.setRed(qrand() % 255);
+                        slice.m_color.setGreen(qrand() % 255);
+                        slice.m_color.setBlue(qrand() % 255);
+                    }
+                }
                 // TODO: no need to create new slices in case size changed; we should re-use the existing ones
                 while (m_slices.count())

src/piechart/piepresenter.h +1 -1

                 void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
             public:
-                void updateGeometry();
                 QRectF pieRect() const { return m_pieRect; }
             public Q_SLOTS:
                 void handleSeriesChanged(const PieChangeSet& changeSet);
                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& rect);
+                void updateGeometry();
             private:
                 friend class PieSlice;

src/piechart/pieslice.cpp +3 -5

             #include <QPainter>
             #include <QDebug>
             #include <qmath.h>
+            #include <QGraphicsSceneEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             void PieSlice::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
             {
-                QGraphicsItem::hoverEnterEvent(event);
                 m_brush = QBrush(sliceData().m_color.lighter());
                 update();
             }
-            void PieSlice::hoverLeaveEvent(QGraphicsSceneHoverEvent * event)
+            void PieSlice::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
-                QGraphicsItem::hoverLeaveEvent(event);
                 m_brush = QBrush(sliceData().m_color);
                 update();
             }
-            void PieSlice::mousePressEvent(QGraphicsSceneMouseEvent *event)
+            void PieSlice::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
             {
-                QGraphicsItem::mousePressEvent(event);
                 QPieSlice data = sliceData();
                 data.m_isExploded = !data.m_isExploded;
                 (static_cast<PiePresenter*>(parentItem()))->m_pieSeries->update(m_seriesIndex, data);

src/piechart/qpieseries.cpp +27 -5

             }
-            void QPieSeries::set(QList<QPieSlice> slices)
+            bool QPieSeries::setData(QList<qreal> data)
             {
+                QList<QPieSlice> slices;
+                foreach (int value, data)
+                    slices << QPieSlice(value, QString::number(value));
+                return set(slices);
+            }
+            bool QPieSeries::set(QList<QPieSlice> slices)
+            {
+                if (!slices.count())
+                    return false;
                 PieChangeSet changeSet;
                 for (int i=slices.count(); i<m_slices.count(); i++)
                 m_slices = slices;
                 emit changed(changeSet);
+                return true;
             }
-            void QPieSeries::add(QList<QPieSlice> slices)
+            bool QPieSeries::add(QList<QPieSlice> slices)
             {
+                if (!slices.count())
+                    return false;
                 PieChangeSet changeSet;
                 for (int i=0; i<slices.count(); i++)
                     changeSet.m_added << m_slices.count() + i;
                 m_slices += slices;
                 emit changed(changeSet);
+                return true;
             }
-            void QPieSeries::add(QPieSlice slice)
+            bool QPieSeries::add(QPieSlice slice)
             {
-                add(QList<QPieSlice>() << slice);
+                return add(QList<QPieSlice>() << slice);
             }
             QPieSlice QPieSeries::slice(int index) const
             void QPieSeries::setSizeFactor(qreal factor)
             {
-                if (factor > 0.0)
+                if (factor < 0.0)
+                    return;
+                if (m_sizeFactor != factor) {
                     m_sizeFactor = factor;
                     emit sizeFactorChanged();
                 }
+            }
             void QPieSeries::setPosition(PiePosition position)
             {
+                if (m_position != position) {
                     m_position = position;
                     emit positionChanged();
                 }
+            }
             #include "moc_qpieseries.cpp"

src/piechart/qpieseries.h +8 -6

             {
             public:
                 QPieSlice()
-                    :m_value(0), m_label("<empty>"), m_color(Qt::white), m_isExploded(false) {}
+                    :m_value(0), m_label("<empty>"), m_color(QColor::Invalid), m_isExploded(false) {}
-                QPieSlice(qreal value, QString label, QColor color, bool exploded = false)
+                QPieSlice(qreal value, QString label = "<empty>", QColor color = QColor::Invalid, bool exploded = false)
                     :m_value(value), m_label(label), m_color(color), m_isExploded(exploded) {}
             public:
                 qreal m_value;
                 QString m_label;
-                QColor m_color;
+                QColor m_color; // TODO: should we even define color here?
                 bool m_isExploded;
             };
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypePie; }
+                virtual bool setData(QList<qreal> data);
             public:
-                void set(QList<QPieSlice> slices);
+                bool set(QList<QPieSlice> slices);
-                void add(QList<QPieSlice> slices);
+                bool add(QList<QPieSlice> slices);
-                void add(QPieSlice slice);
+                bool add(QPieSlice slice);
                 int count() const { return m_slices.count(); }
             private:
                 Q_DISABLE_COPY(QPieSeries)
+                friend class PiePresenter;
                 // TODO: use PIML
                 QList<QPieSlice> m_slices;
                 qreal m_sizeFactor;

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