HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1697:b1c06caff815

Removed QDonutGroup class. Added Donut Drill down example

Marek Rosa -

r1697:b1c06caff815

parent child

Context file:

r1697:b1c06caff815

Collapse all files

examples/donutdrilldown/donutdrilldown.pro created 644 +9 0

@@ -0,0 +1,9
	1	!include( ../examples.pri ) {
	2	error( "Couldn't find the examples.pri file!" )
	3	}
	4
	5	TARGET = donutdrilldown
	6	SOURCES += main.cpp\
	7	widget.cpp
	8
	9	HEADERS += widget.h

examples/donutdrilldown/main.cpp created 644 +11 0

@@ -0,0 +1,11
	1	#include <QApplication>
	2	#include "widget.h"
	3
	4	int main(int argc, char *argv[])
	5	{
	6	QApplication a(argc, argv);
	7	Widget w;
	8	w.show();
	9
	10	return a.exec();
	11	}

examples/donutdrilldown/widget.cpp created 644 +120 0

@@ -0,0 +1,120
	1	#include "widget.h"
	2	#include <QGridLayout>
	3
	4	#include <QPieSlice>
	5	#include <QTime>
	6	#include <QChartView>
	7	#include <QTimer>
	8
	9	QTCOMMERCIALCHART_USE_NAMESPACE
	10
	11	Widget::Widget(QWidget *parent)
	12	: QWidget(parent),
	13	mainData(0)
	14	{
	15	setMinimumSize(800, 600);
	16	qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
	17
	18	QChartView *chartView = new QChartView;
	19	chartView->setRenderHint(QPainter::Antialiasing);
	20	chartView->chart()->setAnimationOptions(QChart::AllAnimations);
	21
	22	mainData = new QPieSeries;
	23	for (int j = 0; j < 4; j++) {
	24
	25	// create new slice for the mainData
	26	QPieSlice *slice = new QPieSlice;
	27	slice->setLabelPosition(QPieSlice::LabelInside);
	28	slice->setLabelColor(Qt::white);
	29	mainData->append(slice);
	30
	31	// create a new detailed data for the slice
	32	QPieSeries *donut = new QPieSeries;
	33	donut->setDonut();
	34	donut->setLabelsVisible();
	35	donut->setDonutInnerSize(mainData->pieSize());
	36	donut->setPieSize(mainData->pieSize() + 0.2);
	37
	38	// when mainData slice is redrawn make sure the detailed data slices are aligned with it
	39	connect(slice, SIGNAL(startAngleChanged()), this, SLOT(updatedStartAngle()));
	40	connect(slice, SIGNAL(angleSpanChanged()), this, SLOT(updatedAngleSpan()));
	41
	42	// create the detailed data
	43	for (int j = 0; j < 3; j++) {
	44	qreal value = 10 + qrand() % 100;
	45	QPieSlice *slice = new QPieSlice(QString("%1").arg(value), value);
	46	donut->append(slice);
	47	donut->slices().last()->setLabelVisible(true);
	48	donut->slices().last()->setLabelColor(Qt::white);
	49	}
	50	detailedData.append(donut);
	51
	52	// update the value and label of mainData
	53	slice->setValue(donut->sum());
	54	slice->setLabel(QString("%1").arg(donut->sum()));
	55	}
	56
	57	mainData->setLabelsVisible();
	58	chartView->chart()->addSeries(mainData);
	59	for (int i = 0; i < detailedData.count(); i++)
	60	chartView->chart()->addSeries(detailedData.at(i));
	61
	62	// create main layout
	63	QGridLayout* mainLayout = new QGridLayout;
	64	mainLayout->addWidget(chartView, 1, 1);
	65	setLayout(mainLayout);
	66
	67	// modify the value of one detailed slice every 2.5 sec
	68	QTimer *updateTimer = new QTimer(this);
	69	connect(updateTimer, SIGNAL(timeout()), this, SLOT(highlight()));
	70	updateTimer->start(2500);
	71	}
	72
	73	Widget::~Widget()
	74	{
	75
	76	}
	77
	78	void Widget::updatedStartAngle()
	79	{
	80	// when the mainData slice has been updated the detailed data QPieSeries object as well
	81	QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
	82	QPieSeries *detailsDonut = detailedData.at(slice->series()->slices().indexOf(slice));
	83	detailsDonut->setPieStartAngle(slice->startAngle());
	84	}
	85
	86	void Widget::updatedAngleSpan()
	87	{
	88	// when the mainData slice has been updated the detailed data QPieSeries object as well
	89	QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
	90	QPieSeries *detailsDonut = detailedData.at(slice->series()->slices().indexOf(slice));
	91	detailsDonut->setPieEndAngle(slice->startAngle() + slice->angleSpan());
	92	}
	93
	94	void Widget::updateRotation()
	95	{
	96	// update the selected slice
	97	qreal newValue = 10 + qrand() % 100;
	98	detailedData.at(detailIndex)->slices().at(sliceIndex)->setValue(newValue);
	99	detailedData.at(detailIndex)->slices().at(sliceIndex)->setLabel(QString("%1").arg(newValue));
	100
	101	// update the mainData slice with a new sum of the detailed data values
	102	mainData->slices().at(detailIndex)->setValue(detailedData.at(detailIndex)->sum());
	103	mainData->slices().at(detailIndex)->setLabel(QString("%1").arg(detailedData.at(detailIndex)->sum()));
	104
	105	// change the explode state of the selected slice back to normal
	106	detailedData.at(detailIndex)->slices().at(sliceIndex)->setExploded(false);
	107	}
	108
	109	void Widget::highlight()
	110	{
	111	// choose one random detailed data slice to be updated.
	112	detailIndex = qrand() % mainData->count();
	113	sliceIndex = qrand() % detailedData.at(detailIndex)->count();
	114
	115	// set the slice to exploded to make the change easier to observe
	116	detailedData.at(detailIndex)->slices().at(sliceIndex)->setExploded();
	117
	118	// give the user time to focus on the slice that will be changed
	119	QTimer::singleShot(1000, this, SLOT(updateRotation()));
	120	}

examples/donutdrilldown/widget.h created 644 +30 0

@@ -0,0 +1,30
	1	#ifndef WIDGET_H
	2	#define WIDGET_H
	3
	4	#include <QWidget>
	5	#include <QPieSeries>
	6
	7	QTCOMMERCIALCHART_USE_NAMESPACE
	8
	9	class Widget : public QWidget
	10	{
	11	Q_OBJECT
	12
	13	public:
	14	Widget(QWidget *parent = 0);
	15	~Widget();
	16
	17	public slots:
	18	void updatedStartAngle();
	19	void updatedAngleSpan();
	20	void updateRotation();
	21	void highlight();
	22
	23	private:
	24	QPieSeries *mainData;
	25	QList<QPieSeries *> detailedData;
	26	int detailIndex;
	27	int sliceIndex;
	28	};
	29
	30	#endif // WIDGET_H

examples/donut/widget.cpp +42 -12

             #include "widget.h"
             #include <QChartView>
             #include <QPieSeries>
             #include <QPieSlice>
             #include <QTime>
             #include <QGridLayout>
             #include <QTimer>
             QTCOMMERCIALCHART_USE_NAMESPACE
             Widget::Widget(QWidget *parent)
                 : QWidget(parent)
             {
                 setMinimumSize(800, 600);
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 QChartView *chartView = new QChartView;
                 chartView->setRenderHint(QPainter::Antialiasing);
-                for (int i = 0; i < 7; i++) {
+                qreal minSize = 0.1;
+                qreal maxSize = 0.9;
+                int donutsCount = 5;
+                for (int i = 0; i < donutsCount; i++) {
                     QPieSeries *donut = new QPieSeries;
+                    donut->setDonut();
                     donut->setLabelsVisible();
-                    for (int j = 0; j < 4; j++) {
+                    int sliceCount =  3 + qrand() % 3;
+                    for (int j = 0; j < sliceCount; j++) {
                         qreal value = 100 + qrand() % 100;
-                        donut->append(QString("%1").arg(value), value);
+                        QPieSlice *slice = new QPieSlice(QString("%1").arg(value), value);
+                        connect(slice, SIGNAL(hovered(bool)), this, SLOT(explodeSlice(bool)));
+                        donut->append(slice);
                         donut->slices().last()->setLabelVisible(true);
-            //            QFont labelFont = donut->slices().last()->labelFont();
+                        donut->slices().last()->setLabelColor(Qt::white);
-            //            //            labelFont.setUnderline(true);
+                        donut->setDonutInnerSize(minSize + i * (maxSize - minSize) / donutsCount);
-            //            labelFont.setBold(true);
+                        donut->setPieSize(minSize + (i + 1) * (maxSize - minSize) / donutsCount);
-            //            donut->slices().last()->setLabelFont(labelFont);
-                                    donut->slices().last()->setLabelColor(Qt::white);
                     }
+                    m_donuts.append(donut);
                     qreal phase = qrand() % 180;
                     donut->setPieStartAngle(phase);
                     donut->setPieEndAngle(360 + phase);
                     chartView->chart()->addSeries(donut);
-                    m_donutsGroup.append(donut);
                 }
                 // create main layout
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addWidget(chartView, 1, 1);
                 setLayout(mainLayout);
                 chartView->chart()->setAnimationOptions(QChart::AllAnimations);
-                QTimer *updateTimer = new QTimer(this);
+                updateTimer = new QTimer(this);
                 connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateRotation()));
                 updateTimer->start(750);
             }
             Widget::~Widget()
             {
             }
             void Widget::updateRotation()
             {
-                for (int i = 0; i < m_donutsGroup.count(); i++) {
+                //    int tobeupdated = qrand() % m_donutsGroup.count();
-                    QPieSeries *donut = m_donutsGroup.donuts().at(i);
+                for (int i = 0; i < m_donuts.count(); i++) {
+                    QPieSeries *donut = m_donuts.at(i);
                     qreal phaseShift =  -50 + qrand() % 100;
                     donut->setPieStartAngle(donut->pieStartAngle() + phaseShift);
                     donut->setPieEndAngle(donut->pieEndAngle() + phaseShift);
                 }
             }
+            void Widget::explodeSlice(bool exploded)
+            {
+                QPieSlice *slice = qobject_cast<QPieSlice *>(sender());
+                if (exploded) {
+                    updateTimer->stop();
+                    qreal sliceStartAngle = slice->startAngle();
+                    qreal sliceEndAngle = slice->startAngle() + slice->angleSpan();
+                    QPieSeries *donut = slice->series();
+                    qreal seriesIndex = m_donuts.indexOf(donut);
+                    for (int i = seriesIndex + 1; i < m_donuts.count(); i++) {
+                        m_donuts.at(i)->setPieStartAngle(sliceEndAngle);
+                        m_donuts.at(i)->setPieEndAngle(360 + sliceStartAngle);
+                    }
+                } else {
+                    for (int i = 0; i < m_donuts.count(); i++) {
+                        m_donuts.at(i)->setPieStartAngle(0);
+                        m_donuts.at(i)->setPieEndAngle(360);
+                    }
+                    updateTimer->start();
+                }
+                slice->setExploded(exploded);
+            }

examples/donut/widget.h +6 -2

             #ifndef WIDGET_H
             #define WIDGET_H
             #include <QWidget>
-            #include <QDonutGroup>
+            #include <QPieSeries>
+            class QTimer;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Widget : public QWidget
             {
                 Q_OBJECT
             public:
                 Widget(QWidget *parent = 0);
                 ~Widget();
             public slots:
                 void updateRotation();
+                void explodeSlice(bool exploded);
             private:
-                QDonutGroup m_donutsGroup;
+                QList<QPieSeries *> m_donuts;
+                QTimer *updateTimer;
             };
             #endif // WIDGET_H

examples/examples.pro +2 -1

             CURRENTLY_BUILDING_COMPONENTS = "examples"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
                        customchart \
                        linechart \
                        percentbarchart \
                        piechart \
                        piechartdrilldown \
                        presenterchart \
                        scatterchart \
                        scatterinteractions \
                        splinechart \
                        stackedbarchart \
                        stackedbarchartdrilldown \
                        zoomlinechart \
                        modeldata \
                        barchart \
                        legend \
                        barmodelmapper \
                        qmlpiechart \
                        lineandbar \
                        horizontalbarchart \
                        horizontalstackedbarchart \
                        horizontalpercentbarchart \
-                       donut
+                       donut \
+                       donutdrilldown

src/piechart/piechart.pri +3 -6

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/qpieseries.cpp \
                 $$PWD/piesliceitem.cpp \
                 $$PWD/piechartitem.cpp \
                 $$PWD/qpieslice.cpp \
                 $$PWD/qpiemodelmapper.cpp \
                 $$PWD/qvpiemodelmapper.cpp \
-                $$PWD/qhpiemodelmapper.cpp \
+                $$PWD/qhpiemodelmapper.cpp
-                piechart/qdonutgroup.cpp
             PRIVATE_HEADERS += \
                 $$PWD/pieslicedata_p.h \
                 $$PWD/piechartitem_p.h \
                 $$PWD/piesliceitem_p.h \
                 $$PWD/qpieslice_p.h \
                 $$PWD/qpieseries_p.h \
-                $$PWD/qpiemodelmapper_p.h \
+                $$PWD/qpiemodelmapper_p.h
-                $$PWD/qdonutgroup_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qpieseries.h \
                 $$PWD/qpieslice.h \
                 $$PWD/qpiemodelmapper.h \
                 $$PWD/qvpiemodelmapper.h \
-                $$PWD/qhpiemodelmapper.h \
+                $$PWD/qhpiemodelmapper.h
-                $$PWD/qdonutgroup.h

src/piechart/piesliceitem.cpp +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$
             **
             ****************************************************************************/
             #include "piesliceitem_p.h"
             #include "piechartitem_p.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <qmath.h>
             #include <QGraphicsSceneEvent>
             #include <QTime>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QPointF offset(qreal angle, qreal length)
             {
                 qreal dx = qSin(angle*(M_PI/180)) * length;
                 qreal dy = qCos(angle*(M_PI/180)) * length;
                 return QPointF(dx, -dy);
             }
             PieSliceItem::PieSliceItem(QGraphicsItem* parent)
                 :QGraphicsObject(parent),
                   m_hovered(false)
             {
                 setAcceptHoverEvents(true);
                 setAcceptedMouseButtons(Qt::MouseButtonMask);
                 setZValue(ChartPresenter::PieSeriesZValue);
             }
             PieSliceItem::~PieSliceItem()
             {
                 // If user is hovering over the slice and it gets destroyed we do
                 // not get a hover leave event. So we must emit the signal here.
                 if (m_hovered)
                     emit hovered(false);
             }
             QRectF PieSliceItem::boundingRect() const
             {
                 return m_boundingRect;
             }
             QPainterPath PieSliceItem::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 PieSliceItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/)
             {
                 painter->save();
                 painter->setClipRect(parentItem()->boundingRect());
                 painter->setPen(m_data.m_slicePen);
                 painter->setBrush(m_data.m_sliceBrush);
                 painter->drawPath(m_slicePath);
                 painter->restore();
                 if (m_data.m_isLabelVisible) {
                     painter->save();
                     // Pen for label arm not defined in the QPieSeries api, let's use brush's color instead
                     // Also, the drawText actually uses the pen color for the text color (unlike QGraphicsSimpleTextItem)
                     painter->setPen(m_data.m_labelBrush.color());
                     painter->setBrush(m_data.m_labelBrush);
                     painter->setFont(m_data.m_labelFont);
                     if (m_data.m_donut) {
                         painter->translate(m_labelTextRect.center());
                         painter->rotate(m_data.m_startAngle + m_data.m_angleSpan / 2);
                         painter->drawText(-m_labelTextRect.width() / 2, -m_labelTextRect.height() / 2, m_labelTextRect.width(), m_labelTextRect.height(), Qt::AlignCenter, m_data.m_labelText);
-                    }else if (m_data.m_labelPosition == QPieSlice::LabelOutside) {
+                    } else if (m_data.m_labelPosition == QPieSlice::LabelOutside) {
                         painter->setClipRect(parentItem()->boundingRect());
                         painter->strokePath(m_labelArmPath, m_data.m_labelBrush.color());
                         painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);
                     } else { // QPieSlice::LabelInside
                         painter->setClipPath(m_slicePath);
                         painter->drawText(m_labelTextRect, Qt::AlignCenter, m_data.m_labelText);
                     }
                     painter->restore();
                 }
             }
             void PieSliceItem::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 m_hovered = true;
                 emit hovered(true);
             }
             void PieSliceItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 m_hovered = false;
                 emit hovered(false);
             }
             void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit clicked(event->buttons());
             }
             void PieSliceItem::setLayout(const PieSliceData &sliceData)
             {
                 m_data = sliceData;
                 updateGeometry();
                 update();
             }
             void PieSliceItem::updateGeometry()
             {
                 if (m_data.m_radius <= 0)
                     return;
                 prepareGeometryChange();
                 // slice path
                 qreal centerAngle;
                 QPointF armStart;
                 m_slicePath = slicePath(m_data.m_center, m_data.m_radius, m_data.m_startAngle, m_data.m_angleSpan, &centerAngle, &armStart);
                 // text rect
                 QFontMetricsF fm(m_data.m_labelFont);
                 m_labelTextRect = QRectF(0, 0, fm.width(m_data.m_labelText), fm.height());
                 // label arm path
                 QPointF labelTextStart;
                 m_labelArmPath = labelArmPath(armStart, centerAngle, m_data.m_radius * m_data.m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
                 // text position
                 if (m_data.m_donut) {
                     QPointF donutCenter = m_data.m_center + offset(centerAngle, m_data.m_innerRadius + (m_data.m_radius - m_data.m_innerRadius) / 2);
                     m_labelTextRect.moveCenter(donutCenter);
                 } else if (m_data.m_labelPosition == QPieSlice::LabelOutside) {
                     m_labelTextRect.moveBottomLeft(labelTextStart);
                 } else {// QPieSlice::LabelInside
                     QPointF sliceCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);
                     m_labelTextRect.moveCenter(sliceCenter);
                 }
                 //  bounding rect
                 if (m_data.m_isLabelVisible)
                     m_boundingRect = m_slicePath.boundingRect().united(m_labelArmPath.boundingRect()).united(m_labelTextRect);
                 else
                     m_boundingRect = m_slicePath.boundingRect();
             }
             QPointF PieSliceItem::sliceCenter(QPointF point, qreal radius, QPieSlice *slice)
             {
                 if (slice->isExploded()) {
                     qreal centerAngle = slice->startAngle() + (slice->angleSpan()/2);
                     qreal len = radius * slice->explodeDistanceFactor();
                     point += offset(centerAngle, len);
                 }
                 return point;
             }
             QPainterPath PieSliceItem::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, 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);
                 // slice path
                 QPainterPath path;
                 if (m_data.m_donut) {
                     QRectF insideRect(center.x() - m_data.m_innerRadius, center.y()-m_data.m_innerRadius, m_data.m_innerRadius*2, m_data.m_innerRadius*2);
                     path.arcMoveTo(rect, -startAngle + 90);
                     path.arcTo(rect, -startAngle + 90, -angleSpan);
                     path.arcTo(insideRect, -startAngle + 90 - angleSpan, angleSpan);
                     path.closeSubpath();
                 } else {
                     path.moveTo(rect.center());
                     path.arcTo(rect, -startAngle + 90, -angleSpan);
                     path.closeSubpath();
                 }
                 // calculate label arm start point
                 *armStart = center;
                 *armStart += offset(*centerAngle, radius + PIESLICE_LABEL_GAP);
                 return path;
             }
             QPainterPath PieSliceItem::labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF *textStart)
             {
                 // Normalize the angle to 0-360 range
                 // NOTE: We are using int here on purpose. Depenging on platform and hardware
                 // qreal can be a double, float or something the user gives to the Qt configure
                 // (QT_COORD_TYPE). Compilers do not seem to support modulo for double or float
                 // but there are fmod() and fmodf() functions for that. So instead of some #ifdef
                 // that might break we just use int. Precision for this is just fine for our needs.
                 int normalized = angle * 10.0;
                 normalized = normalized % 3600;
                 if (normalized < 0)
                     normalized += 3600;
                 angle = (qreal) normalized / 10.0;
                 // prevent label arm pointing straight down because it will look bad
                 if (angle < 180 && angle > 170)
                     angle = 170;
                 if (angle > 180 && angle < 190)
                     angle = 190;
                 // line from slice to label
                 QPointF parm1 = start + offset(angle, length);
                 // line to underline the label
                 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;
                 }
                 QPainterPath path;
                 path.moveTo(start);
                 path.lineTo(parm1);
                 path.lineTo(parm2);
                 return path;
             }
             #include "moc_piesliceitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qdonutgroup.cpp removed 0 -75

NO CONTENT: file was removed

src/piechart/qdonutgroup.h removed 0 -35

NO CONTENT: file was removed

src/piechart/qdonutgroup_p.h removed 0 -29

NO CONTENT: file was removed

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