HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r490:5facde66eb08

Z order for pie

Tero Ahola -

r490:5facde66eb08

parent child

Context file:

r490:5facde66eb08

Collapse all files

examples/examples.pro +2 -1

             TEMPLATE = subdirs
             SUBDIRS += linechart \
                        zoomlinechart \
                        colorlinechart \
                        barchart \
                        stackedbarchart \
                        percentbarchart \
                        scatterchart \
                        piechart \
                        piechartcustomization \
                        piechartdrilldown \
                        dynamiclinechart \
                        axischart \
                        multichart \
                        gdpbarchart \
                        presenterchart \
                        chartview \
                        scatterinteractions \
                        splinechart \
                        areachart \
-                       stackedbarchartdrilldown
+                       stackedbarchartdrilldown \
+                       customcolors

src/chartpresenter_p.h +2 -1

             #ifndef CHARTPRESENTER_H_
             #define CHARTPRESENTER_H_
             #include "qchartglobal.h"
             #include "qchart.h" //becouse of QChart::ChartThemeId //TODO
             #include "qchartaxis.h"
             #include <QRectF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
             class QSeries;
             class ChartDataSet;
             //class QChart;
             class Domain;
             class AxisItem;
             class ChartTheme;
             class ChartPresenter: public QObject
             {
                 Q_OBJECT
             public:
                 enum ZValues {
                     BackgroundZValue = -1,
                     ShadesZValue,
                     GridZValue,
                     AxisZValue,
                     LineChartZValue,
-                    ScatterSeriesZValue
+                    ScatterSeriesZValue,
+                    PieSeriesZValue
                 };
                 ChartPresenter(QChart* chart,ChartDataSet *dataset);
                 virtual ~ChartPresenter();
                 void setMargin(int margin);
                 int margin() const;
                 QRectF geometry() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme();
                 void setAnimationOptions(QChart::AnimationOptions options);
                 QChart::AnimationOptions animationOptions() const;
                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
                 void zoomReset();
             private:
                 void createConnections();
             public slots:
                 void handleSeriesAdded(QSeries* series,Domain* domain);
                 void handleSeriesRemoved(QSeries* series);
                 void handleAxisAdded(QChartAxis* axis,Domain* domain);
                 void handleAxisRemoved(QChartAxis* axis);
                 void handleGeometryChanged();
             signals:
                 void geometryChanged(const QRectF& rect);
             private:
                 QChart* m_chart;
                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
                 int m_zoomIndex;
                 int m_marginSize;
                 QMap<QSeries*,ChartItem*> m_chartItems;
                 QMap<QChartAxis*,AxisItem*> m_axisItems;
                 QVector<QRectF> m_zoomStack;
                 QRectF m_rect;
                 QChart::AnimationOptions m_options;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTPRESENTER_H_ */

src/piechart/piepresenter.cpp +4 0

             #include "piepresenter_p.h"
             #include "pieslice_p.h"
             #include "qpieslice.h"
             #include "qpieseries.h"
+            #include "chartpresenter_p.h"
             #include <QDebug>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PiePresenter::PiePresenter(QGraphicsItem *parent, QPieSeries *series)
                 :ChartItem(parent),
                 m_series(series)
             {
                 Q_ASSERT(series);
                 connect(series, SIGNAL(changed(const QPieSeries::ChangeSet&)), this, SLOT(handleSeriesChanged(const QPieSeries::ChangeSet&)));
                 connect(series, SIGNAL(sizeFactorChanged()), this, SLOT(updateGeometry()));
                 connect(series, SIGNAL(positionChanged()), this, SLOT(updateGeometry()));
                 if (m_series->count()) {
                     QPieSeries::ChangeSet changeSet;
                     changeSet.appendAdded(m_series->m_slices);
                     handleSeriesChanged(changeSet);
                 }
+                // Note: the following does not affect as long as the item does not have anything to paint
+                setZValue(ChartPresenter::PieSeriesZValue);
             }
             PiePresenter::~PiePresenter()
             {
                 // slices deleted automatically through QGraphicsItem
             }
             void PiePresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
             {
                 // TODO: paint shadows for all components
                 // - get paths from items & merge & offset and draw with shadow color?
                 //painter->setBrush(QBrush(Qt::red));
                 //painter->drawRect(m_debugRect);
             }
             void PiePresenter::handleSeriesChanged(const QPieSeries::ChangeSet& changeSet)
             {
                 //qDebug() << "PiePresenter::handleSeriesChanged()";
                 //qDebug() << "  added  : " << changeSet.added();
                 //qDebug() << "  changed: " << changeSet.changed();
                 //qDebug() << "  removed: " << changeSet.removed();
                 foreach (QPieSlice* s, changeSet.added())
                     addSlice(s);
                 foreach (QPieSlice* s, changeSet.changed())
                     updateSlice(s);
                 foreach (QPieSlice* s, changeSet.removed())
                     deleteSlice(s);
                 // every change possibly changes the actual pie size
                 updateGeometry();
             }
             void PiePresenter::handleDomainChanged(const Domain& domain)
             {
                 // TODO
             }
             void PiePresenter::handleGeometryChanged(const QRectF& rect)
             {
                 m_rect = rect;
                 prepareGeometryChange();
                 updateGeometry();
             }
             void PiePresenter::updateGeometry()
             {
                 if (!m_rect.isValid() || m_rect.isEmpty())
                     return;
                 // find pie center coordinates
                 QPointF center;
                 center.setX(m_rect.left() + (m_rect.width() * m_series->m_hPositionFactor));
                 center.setY(m_rect.top() + (m_rect.height() * m_series->m_vPositionFactor));
                 // find maximum radius for pie
                 qreal radius = m_rect.height() / 2;
                 if (m_rect.width() < m_rect.height())
                     radius = m_rect.width() / 2;
                 // apply size factor
                 radius *= m_series->m_pieSizeFactor;
                 // update slices
                 if (m_pieCenter != center || m_pieRadius != radius) {
                     m_pieCenter = center;
                     m_pieRadius = radius;
                     //qDebug() << "PiePresenter::updateGeometry()" << m_rect << m_pieCenter << m_pieRadius;
                     foreach (PieSlice* s, m_slices.values()) {
                         s->setPieCenterAndRadius(center, radius);
                         s->updateGeometry();
                         s->update();
                     }
                 }
                 update();
             }
             void PiePresenter::addSlice(QPieSlice* sliceData)
             {
                 //qDebug() << "PiePresenter::addSlice()" << sliceData;
                 if (m_slices.keys().contains(sliceData)) {
                     Q_ASSERT(0); // TODO: how to handle this nicely?
                     return;
                 }
                 // create slice
                 PieSlice *slice = new PieSlice(this);
                 slice->setPieCenterAndRadius(m_pieCenter, m_pieRadius);
                 slice->updateData(sliceData);
                 slice->updateGeometry();
                 slice->update();
                 m_slices.insert(sliceData, slice);
                 // connect signals
                 connect(slice, SIGNAL(clicked()), sliceData, SIGNAL(clicked()));
                 connect(slice, SIGNAL(hoverEnter()), sliceData, SIGNAL(hoverEnter()));
                 connect(slice, SIGNAL(hoverLeave()), sliceData, SIGNAL(hoverLeave()));
             }
             void PiePresenter::updateSlice(QPieSlice* sliceData)
             {
                 //qDebug() << "PiePresenter::updateSlice()" << sliceData;
                 if (!m_slices.contains(sliceData)) {
                     Q_ASSERT(0); // TODO: how to handle this nicely?
                     return;
                 }
                 m_slices[sliceData]->updateData(sliceData);
             }
             void PiePresenter::deleteSlice(QPieSlice* sliceData)
             {
                 //qDebug() << "PiePresenter::deleteSlice()" << sliceData;
                 if (!m_slices.contains(sliceData)) {
                     Q_ASSERT(0); // TODO: how to handle this nicely?
                     return;
                 }
                 delete m_slices.take(sliceData);
             }
             #include "moc_piepresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/pieslice.cpp +2 0

             #include "pieslice_p.h"
             #include "piepresenter_p.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
+            #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QDebug>
             #include <qmath.h>
             #include <QGraphicsSceneEvent>
             #include <QTime>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             #define PI 3.14159265 // TODO: is this defined in some header?
             QPointF offset(qreal angle, qreal length)
             {
                 qreal dx = qSin(angle*(PI/180)) * length;
                 qreal dy = qCos(angle*(PI/180)) * length;
                 return QPointF(dx, -dy);
             }
             PieSlice::PieSlice(QGraphicsItem* parent)
                 :QGraphicsObject(parent),
                 m_pieRadius(0),
                 m_startAngle(0),
                 m_angleSpan(0),
                 m_isExploded(false),
                 m_explodeDistanceFactor(0),
                 m_labelVisible(false),
                 m_labelArmLengthFactor(0)
             {
                 setAcceptHoverEvents(true);
                 setAcceptedMouseButtons(Qt::LeftButton);
+                setZValue(ChartPresenter::PieSeriesZValue);
             }
             PieSlice::~PieSlice()
             {
             }
             QRectF PieSlice::boundingRect() const
             {
                 return m_slicePath.boundingRect();
             }
             QPainterPath PieSlice::shape() const
             {
                 // Don't include the label and label arm.
                 // This is used to detect a mouse clicks. We do not want clicks from label.
                 return m_slicePath;
             }
             void PieSlice::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/)
             {
                 painter->setClipRect(parentItem()->boundingRect());
                 painter->save();
                 painter->setPen(m_slicePen);
                 painter->setBrush(m_sliceBrush);
                 painter->drawPath(m_slicePath);
                 painter->restore();
                 if (m_labelVisible) {
                     painter->save();
                     painter->setPen(m_labelArmPen);
                     painter->drawPath(m_labelArmPath);
                     painter->restore();
                     painter->setFont(m_labelFont);
                     painter->drawText(m_labelTextRect.bottomLeft(), m_labelText);
                 }
             }
             void PieSlice::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 emit hoverEnter();
             }
             void PieSlice::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 emit hoverLeave();
             }
             void PieSlice::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
             {
                 emit clicked();
             }
             void PieSlice::setPieCenterAndRadius(QPointF center, qreal radius)
             {
                 m_pieCenter = center;
                 m_pieRadius = radius;
             }
             void PieSlice::updateGeometry()
             {
                 if (m_pieRadius <= 0)
                     return;
                 prepareGeometryChange();
                 // update slice path
                 qreal centerAngle;
                 QPointF armStart;
                 m_slicePath = slicePath(m_pieCenter, m_pieRadius, m_startAngle, m_angleSpan, m_isExploded, m_pieRadius * m_explodeDistanceFactor, &centerAngle, &armStart);
                 // update text rect
                 m_labelTextRect = labelTextRect(m_labelFont, m_labelText);
                 // update label arm path
                 QPointF labelTextStart;
                 m_labelArmPath = labelArmPath(armStart, centerAngle, m_pieRadius * m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
                 // update text position
                 m_labelTextRect.moveBottomLeft(labelTextStart);
                 //qDebug() << "PieSlice::updateGeometry" << m_labelText << boundingRect() << m_startAngle << m_startAngle + m_angleSpan;
             }
             void PieSlice::updateData(const QPieSlice* sliceData)
             {
                 // TODO: compare what has changes to avoid unneccesary geometry updates
                 m_startAngle = sliceData->startAngle();
                 m_angleSpan = sliceData->m_angleSpan;
                 m_isExploded = sliceData->isExploded();
                 m_explodeDistanceFactor = sliceData->explodeDistanceFactor();
                 m_slicePen = sliceData->slicePen();
                 m_sliceBrush = sliceData->sliceBrush();
                 m_labelVisible = sliceData->isLabelVisible();
                 m_labelText = sliceData->label();
                 m_labelFont = sliceData->labelFont();
                 m_labelArmLengthFactor = sliceData->labelArmLengthFactor();
                 m_labelArmPen = sliceData->labelArmPen();
                 updateGeometry();
                 update();
             }
             QPainterPath PieSlice::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, bool exploded, qreal explodeDistance, qreal* centerAngle, QPointF* armStart)
             {
                 // calculate center angle
                 *centerAngle = startAngle + (angleSpan/2);
                 // calculate slice rectangle
                 QRectF rect(center.x()-radius, center.y()-radius, radius*2, radius*2);
                 // adjust rect for exploding
                 if (exploded) {
                     qreal dx = qSin(*centerAngle*(PI/180)) * explodeDistance;
                     qreal dy = -qCos(*centerAngle*(PI/180)) * explodeDistance;
                     rect.translate(dx, dy);
                 }
                 // slice path
                 // TODO: draw the shape so that it might have a hole in the center
                 QPainterPath path;
                 path.moveTo(rect.center());
                 path.arcTo(rect, -startAngle + 90, -angleSpan);
                 path.closeSubpath();
                 // calculate label arm start point
                 *armStart = center;
                 if (exploded)
                     *armStart += offset(*centerAngle, explodeDistance + radius + PIESLICE_LABEL_GAP);
                 else
                     *armStart += offset(*centerAngle, radius + PIESLICE_LABEL_GAP);
                 return path;
             }
             QPainterPath PieSlice::labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF* textStart)
             {
                 qreal dx = qSin(angle*(PI/180)) * length;
                 qreal dy = -qCos(angle*(PI/180)) * length;
                 QPointF parm1 = start + QPointF(dx, dy);
                 QPointF parm2 = parm1;
                 if (angle < 180) { // arm swings the other way on the left side
                      parm2 += QPointF(textWidth, 0);
                      *textStart = parm1;
                 }
                 else {
                      parm2 += QPointF(-textWidth,0);
                      *textStart = parm2;
                 }
                 // elevate the text position a bit so that it does not hit the line
                 *textStart += QPointF(0, -5);
                 QPainterPath path;
                 path.moveTo(start);
                 path.lineTo(parm1);
                 path.lineTo(parm2);
                 return path;
             }
             QRectF PieSlice::labelTextRect(QFont font, QString text)
             {
                 QFontMetricsF fm(font);
                 return fm.boundingRect(text);
             }
             #include "moc_pieslice_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