HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r51:73eb5fa755de

Integrated draft version of pie series

Tero Ahola -

r51:73eb5fa755de

parent child

Context file:

r51:73eb5fa755de

Collapse all files

src/pieslice.cpp created 644 +75 0

@@ -0,0 +1,75
	1	#include "pieslice.h"
	2	#include <QPainter>
	3	#include <QDebug>
	4
	5	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	6
	7	PieSlice::PieSlice(const QColor& color, qreal startAngle, qreal span)
	8	: m_color(color),
	9	m_startAngle(startAngle),
	10	m_span(span)
	11	{
	12	setAcceptHoverEvents(true);
	13	}
	14
	15	PieSlice::~PieSlice()
	16	{
	17	}
	18
	19	QRectF PieSlice::boundingRect() const
	20	{
	21	return parentItem()->boundingRect();
	22	}
	23
	24	QPainterPath PieSlice::shape() const
	25	{
	26	qreal angle = (-m_startAngle) + (90);
	27	qreal span = -m_span;
	28
	29	QPainterPath path;
	30	path.moveTo(boundingRect().center());
	31	path.arcTo(boundingRect(), angle, span);
	32
	33	// TODO: draw the shape so that it might have a hole in the center
	34	// - Sin & Cos will be needed to find inner/outer arc endpoints
	35
	36	// dx, dy are offsets from the center
	37	//qreal l = boundingRect().height();
	38	//qreal dx = qSin(angle(M_PI/180)) l;
	39	//qreal dy = qCos(angle(M_PI/180)) l;
	40
	41	// TODO: exploded slice?
	42
	43	return path;
	44	}
	45
	46	void PieSlice::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	47	{
	48	// Setup painter
	49	painter->setBrush(m_color);
	50	QPen pen;
	51	//pen.setColor(m_color.darker());
	52	pen.setColor(Qt::gray);
	53	pen.setWidth(1);
	54	painter->setPen(pen);
	55
	56	// From Qt docs:
	57	// The startAngle and spanAngle must be specified in 1/16th of a degree, i.e. a full circle equals 5760 (16 * 360).
	58	// Positive values for the angles mean counter-clockwise while negative values mean the clockwise direction.
	59	// Zero degrees is at the 3 o'clock position.
	60	//
	61	// For sake of simplicity convert this so that zero degrees is at 12 o'clock and full circle is 360.
	62	//qreal angle = (-m_startAngle16) + (9016);
	63	//qreal span = -m_span*16;
	64	//painter->drawPie(boundingRect(), angle, span);
	65
	66	painter->drawPath(shape());
	67	}
	68
	69	void PieSlice::hoverEnterEvent(QGraphicsSceneHoverEvent * event)
	70	{
	71	QGraphicsItem::hoverEnterEvent(event);
	72	qDebug() << "hover" << m_color << m_startAngle << m_span;
	73	}
	74
	75	QTCOMMERCIALCHART_END_NAMESPACE

src/pieslice.h created 644 +31 0

@@ -0,0 +1,31
	1	#ifndef PIESLICE_H
	2	#define PIESLICE_H
	3
	4	#include "qchartglobal.h"
	5	#include <QGraphicsItem>
	6	#include <QRectF>
	7	#include <QColor>
	8
	9	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	10
	11	class PieSlice : public QGraphicsItem
	12	{
	13	public:
	14	PieSlice(const QColor& color, qreal startAngle, qreal span);
	15	~PieSlice();
	16
	17	public: // from QGraphicsItem
	18	QRectF boundingRect() const;
	19	QPainterPath shape() const;
	20	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget);
	21	void hoverEnterEvent(QGraphicsSceneHoverEvent * event);
	22
	23	private:
	24	QColor m_color;
	25	qreal m_startAngle;
	26	qreal m_span;
	27	};
	28
	29	QTCOMMERCIALCHART_END_NAMESPACE
	30
	31	#endif // PIESLICE_H

src/qpieseries.cpp created 644 +54 0

@@ -0,0 +1,54
	1	#include "qpieseries.h"
	2	#include "pieslice.h"
	3	#include <QGraphicsObject>
	4	#include <QDebug>
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	QPieSeries::QPieSeries(QList<qreal> x, QGraphicsObject *parent) :
	9	QChartSeries(parent),
	10	m_x(x)
	11	{
	12	}
	13
	14	QPieSeries::~QPieSeries()
	15	{
	16	}
	17
	18	void QPieSeries::chartSizeChanged(QRectF rect, qreal xscale, qreal yscale)
	19	{
	20	qreal fullPie = 360;
	21	qreal total = 0;
	22	foreach (qreal value, m_x)
	23	total += value;
	24
	25	// We must have a parent for the graphics items we create
	26	// TODO: maybe QChartSeries needs to be a QGraphicsObject to make this clear for the users?
	27	QGraphicsItem parentItem = qobject_cast<QGraphicsItem >(parent());
	28	Q_ASSERT(parentItem);
	29	qreal angle = 0;
	30	foreach (qreal value, m_x) {
	31	qreal span = value / total * fullPie;
	32	PieSlice *slice = new PieSlice(randomColor(), angle, span);
	33	slice->setParentItem(parentItem);
	34	m_slices.append(slice);
	35	angle += span;
	36	}
	37	}
	38
	39	QColor QPieSeries::randomColor()
	40	{
	41	QColor c;
	42	c.setRed(qrand() % 255);
	43	c.setGreen(qrand() % 255);
	44	c.setBlue(qrand() % 255);
	45	return c;
	46	}
	47
	48	void QPieSeries::setData(QList<int> data)
	49	{
	50	}
	51
	52	#include "moc_qpieseries.cpp"
	53
	54	QTCOMMERCIALCHART_END_NAMESPACE

src/qpieseries.h created 644 +40 0

@@ -0,0 +1,40
	1	#ifndef PIESERIES_H
	2	#define PIESERIES_H
	3
	4	#include "qchartseries.h"
	5	#include <QObject>
	6	#include <QRectF>
	7	#include <QColor>
	8
	9	class QGraphicsObject;
	10	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	11	class PieSlice;
	12
	13	class QTCOMMERCIALCHART_EXPORT QPieSeries : public QChartSeries
	14	{
	15	Q_OBJECT
	16	public:
	17	// TODO: use a generic data class instead of x and y
	18	QPieSeries(QList<qreal> x, QGraphicsObject *parent = 0);
	19	~QPieSeries();
	20	QColor randomColor();
	21	void setData(QList<int> data);
	22
	23	public: // from QChartSeries
	24	QChartSeriesType type() const { return QChartSeries::SeriesTypePie; }
	25
	26	public Q_SLOTS:
	27	void chartSizeChanged(QRectF rect, qreal xscale, qreal yscale);
	28
	29	private:
	30	//Q_DECLARE_PRIVATE(QPieSeries)
	31	Q_DISABLE_COPY(QPieSeries)
	32	// TODO: move the followin to internal impl
	33	QList<qreal> m_x;
	34	QList<PieSlice*> m_slices;
	35	QSizeF m_size;
	36	};
	37
	38	QTCOMMERCIALCHART_END_NAMESPACE
	39
	40	#endif // PIESERIES_H

common.pri +1 -1

-            CONFIG+=integrated_build #remove if you want to build against installed libs
+            #CONFIG+=integrated_build #remove if you want to build against installed libs
             CHART_BUILD_HEADER_DIR = $$PWD/include
             CHART_BUILD_LIB_DIR = $$PWD/lib
             CHART_BUILD_DIR = $$PWD/build
             CHART_BUILD_BIN_DIR = $$PWD/bin
             # hack to fix windows builds
             win32:{
             CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\")
             CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
             CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
             CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
             }

src/qchart.cpp +25 -13

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
+            #include "qpieseries.h"
             #include "qxychartseries.h"
             #include "xylinechartitem_p.h"
             #include "xyplotdomain_p.h"
             #include "axis_p.h"
             #include "xygrid_p.h"
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartPrivate
             {
             public:
                 QChartPrivate(QChart* parent):
                 m_axisX(new Axis(parent)),
                 m_axisY(new Axis(parent)),
                 m_grid(new XYGrid(parent)),
                 m_plotDataIndex(0),
                 m_marginSize(0){}
                 Axis* m_axisX;
                 Axis* m_axisY;
                 XYGrid* m_grid;
                 QRect m_rect;
                 QList<const QChartSeries*> m_series;
                 QList<XYPlotDomain> m_plotDomainList;
                 QList<XYLineChartItem*> m_xyLineChartItems;
                 QList<QGraphicsItem*> m_items;
                 int m_plotDataIndex;
                 int m_marginSize;
             };
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
             d(new QChartPrivate(this))
             {
                 //  setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 // set axis
                 d->m_axisY->rotate(90);
             }
             QChart::~QChart(){}
             QRectF QChart::boundingRect() const
             {
                 return d->m_rect;
             }
             void QChart::addSeries(QChartSeries* series)
             {
                 // TODO: we should check the series not already added
                 d->m_series<<series;
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
                     XYPlotDomain domain;
                     //TODO "nice numbers algorithm"
                     domain.m_ticksX=4;
                     domain.m_ticksY=4;
                     for (int i = 0 ; i < xyseries->count() ; i++)
                     {
                         qreal x = xyseries->x(i);
                         qreal y = xyseries->y(i);
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = qMin(domain.m_minY,y);
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = qMax(domain.m_maxY,y);
                     }
                     XYLineChartItem* item = new XYLineChartItem(xyseries,this);
                     item->updateXYPlotDomain(domain);
                     d->m_plotDomainList<<domain;
                     d->m_xyLineChartItems<<item;
                     break;
                 }
-                case QChartSeries::SeriesTypeScatter: {
+                    // TODO: Not tested:
-                    QScatterSeries *scatter = qobject_cast<QScatterSeries *>(series);
+            //    case QChartSeries::SeriesTypeScatter: {
-                    if (scatter) {
+            //        QScatterSeries *scatter = qobject_cast<QScatterSeries *>(series);
-                        scatter->d->setParentItem(this);
+            //        if (scatter) {
-                        scene()->addItem(scatter->d);
+            //            scatter->d->setParentItem(this);
+            //            scene()->addItem(scatter->d);
-                    break;
+            //        }
+            //        break;
+            //    }
                 }
             }
             QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
             {
-                // TODO: support also other types in addition to scatter
+                // TODO: support also other types; not only scatter and pie
-                Q_ASSERT(type == QChartSeries::SeriesTypeScatter);
+                Q_ASSERT(type == QChartSeries::SeriesTypeScatter
-                QChartSeries *series = 0;
+                         || type == QChartSeries::SeriesTypePie);
                 switch (type) {
                 case QChartSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = new QScatterSeries(x, y, this);
+                    connect(this, SIGNAL(sizeChanged(QRectF, qreal, qreal)),
+                            scatterSeries, SLOT(chartSizeChanged(QRectF, qreal, qreal)));
                     scatterSeries->d->setParentItem(this);
-                    break;
+                    return scatterSeries;
+                }
+                case QChartSeries::SeriesTypePie: {
+                    // TODO: we now have also a list of y values as a parameter, it is ignored
+                    // we should use a generic data class instead of list of x and y values
+                    QPieSeries *pieSeries = new QPieSeries(x, this);
+                    connect(this, SIGNAL(sizeChanged(QRectF, qreal, qreal)),
+                            pieSeries, SLOT(chartSizeChanged(QRectF, qreal, qreal)));
+                    return pieSeries;
                 }
                 default:
                     break;
                 }
-                return series;
+                return 0;
             }
             void QChart::setSize(const QSizeF& size)
             {
                 d->m_rect = QRect(QPoint(0,0),size.toSize());
                 d->m_rect.adjust(margin(),margin(), -margin(), -margin());
                 d->m_grid->setPos(d->m_rect.topLeft());
                 d->m_grid->setSize(d->m_rect.size());
                 // TODO: calculate the scale
                 // TODO: calculate the origo
                 // TODO: not sure if emitting a signal here is the best from performance point of view
                 const qreal xscale = size.width() / 100;
                 const qreal yscale = size.height() / 100;
                 emit sizeChanged(QRectF(0, 0, size.width(), size.height()), xscale, yscale);
                 for (int i(0); i < d->m_plotDomainList.size(); i++)
                     d->m_plotDomainList[i].m_viewportRect = d->m_rect;
                 // TODO: line chart items are updated separately as they don't support update
                 // via sizeChanged signal
                 foreach(XYLineChartItem* item , d->m_xyLineChartItems)
                     item->updateXYPlotDomain(d->m_plotDomainList.at(d->m_plotDataIndex));
                 if (d->m_plotDomainList.count())
                     d->m_grid->setXYPlotData(d->m_plotDomainList.at(d->m_plotDataIndex));
                 update();
             }
             int QChart::margin() const
             {
                 return d->m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
                 d->m_marginSize = margin;
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartseries.h +1 -1

             #ifndef QCHARTSERIES_H
             #define QCHARTSERIES_H
             #include "qchartglobal.h"
             #include <QObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
             {
             public:
                 enum QChartSeriesType {
                     SeriesTypeLine = 0,
             //        SeriesTypeArea,
             //        SeriesTypeBar,
-            //        SeriesTypePie,
+                    SeriesTypePie,
                     SeriesTypeScatter
             //        SeriesTypeSpline
                 };
             protected:
                 QChartSeries(QObject *parent = 0):QObject(parent){};
             public:
                 virtual ~QChartSeries(){};
                 //factory method
                 static QChartSeries* create(QObject* parent = 0 ){ return 0;}
                 //pure virtual
                 virtual QChartSeriesType type() const = 0;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qscatterseries.cpp 0 -1

             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qchart.h"
             #include <QPainter>
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //#define QSeriesData QList<qreal>
             QScatterSeriesPrivate::QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent) :
                 QGraphicsItem(parent),
                 m_x(x),
                 m_y(y)
             {
             }
             void QScatterSeriesPrivate::resize(QRectF rect, qreal xscale, qreal yscale)
             {
                 m_scenex.clear();
                 m_sceney.clear();
                 foreach(qreal x, m_x)
                     m_scenex.append(rect.left() + x * xscale);
                 foreach(qreal y, m_y)
                     m_sceney.append(rect.bottom() - y * yscale);
             }
             QRectF QScatterSeriesPrivate::boundingRect() const
             {
                 return QRectF(0, 0, 55, 100);
             }
             void QScatterSeriesPrivate::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 QPen pen = painter->pen();
                 QBrush brush = pen.brush();
                 // TODO: The opacity should be user definable...
                 brush.setColor(QColor(255, 82, 0, 50));
                 pen.setBrush(brush);
                 pen.setWidth(4);
                 painter->setPen(pen);
                 // TODO: m_scenex and m_sceny are left empty during construction -> we would need a resize
                 // event right after construction or maybe given a size during initialization
                 for (int i(0); i < m_scenex.count() && i < m_sceney.count(); i++) {
                     if (scene()->width() > m_scenex.at(i) && scene()->height() > m_sceney.at(i))
                         //painter->drawArc(m_scenex.at(i), m_sceney.at(i), 2, 2, 0, 5760);
                         painter->drawPoint(m_scenex.at(i), m_sceney.at(i));
                 }
             }
             QScatterSeries::QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent) :
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate(x, y, qobject_cast<QGraphicsItem *> (parent)))
             {
-                connect(parent, SIGNAL(sizeChanged(QRectF, qreal, qreal)), this, SLOT(chartSizeChanged(QRectF, qreal, qreal)));
             }
             void QScatterSeries::chartSizeChanged(QRectF rect, qreal xscale, qreal yscale)
             {
                 // Recalculate scatter data point locations on the scene
             //    d->transform().reset();
             //    d->transform().translate();
                 d->resize(rect, xscale, yscale);
             }
             QScatterSeries::~QScatterSeries()
             {
                 delete d;
             }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qscatterseries.h +2 -2

             #ifndef QSCATTERSERIES_H
             #define QSCATTERSERIES_H
             #include "qchartseries.h"
             #include <QRectF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 //QScatterSeries(QSeriesData *data, QObject *chart);
-                QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *chart = 0);
+                QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent = 0);
                 ~QScatterSeries();
             public: // from QChartSeries
-                virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
+                QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
             public Q_SLOTS:
                 void chartSizeChanged(QRectF rect, qreal xscale, qreal yscale);
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)
                 Q_DISABLE_COPY(QScatterSeries)
                 friend class QChart;
                 QScatterSeriesPrivate *const d;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIES_H

src/src.pro +7 -1

             !include( ../common.pri ) {
             error( Couldn't find the common.pri file! )
             }
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 xylinechart/qxychartseries.cpp \
                 xylinechart/xylinechartitem.cpp \
                 xylinechart/xygrid.cpp \
                 xylinechart/xyplotdomain.cpp \
                 qscatterseries.cpp \
+                qpieseries.cpp \
                 qchart.cpp \
                 axis.cpp \
-                qchartwidget.cpp
+                qchartwidget.cpp \
+                pieslice.cpp
             PRIVATE_HEADERS += \
                 xylinechart/xylinechartitem_p.h \
                 xylinechart/xyplotdomain_p.h \
                 xylinechart/xygrid_p.h \
                 qscatterseries_p.h \
+                pieslice.h \
                 axis_p.h
             PUBLIC_HEADERS += \
                 qchartseries.h \
                 qscatterseries.h \
+                qpieseries.h \
                 qchart.h \
                 qchartwidget.h \
                 qchartglobal.h \
                 xylinechart/qxychartseries.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             INCLUDEPATH += xylinechart \
                            .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
             install_build_headers.name = bild_headers
             install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_headers.input = PUBLIC_HEADERS
             install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
             install_build_headers.CONFIG += target_predeps no_link
             QMAKE_EXTRA_COMPILERS += install_build_headers
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo "build_time" > $$chartversion.target;
             chartversion.depends = $$HEADERS $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN+= qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
             unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR

test/chartwidgettest/mainwidget.cpp +2 0

             #include "mainwidget.h"
             #include "dataseriedialog.h"
             #include <qxychartseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 QPushButton *addSeriesButton = new QPushButton("Add series");
                 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 // Chart background
                 QComboBox *backgroundCombo = new QComboBox(this);
                 backgroundCombo->addItem("None");
                 backgroundCombo->addItem("TODO Grid");
                 backgroundCombo->addItem("TODO Image");
                 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(backgroundChanged(int)));
                 // Axis
                 // TODO: multiple axes?
                 m_autoScaleCheck = new QCheckBox("Automatic scaling");
                 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
                 // Allow setting also non-sense values (like -2147483648 and 2147483647)
                 m_xMinSpin = new QSpinBox();
                 m_xMinSpin->setMinimum(INT_MIN);
                 m_xMinSpin->setMaximum(INT_MAX);
                 m_xMinSpin->setValue(0);
                 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
                 m_xMaxSpin = new QSpinBox();
                 m_xMaxSpin->setMinimum(INT_MIN);
                 m_xMaxSpin->setMaximum(INT_MAX);
                 m_xMaxSpin->setValue(10);
                 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
                 m_yMinSpin = new QSpinBox();
                 m_yMinSpin->setMinimum(INT_MIN);
                 m_yMinSpin->setMaximum(INT_MAX);
                 m_yMinSpin->setValue(0);
                 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
                 m_yMaxSpin = new QSpinBox();
                 m_yMaxSpin->setMinimum(INT_MIN);
                 m_yMaxSpin->setMaximum(INT_MAX);
                 m_yMaxSpin->setValue(10);
                 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
                 QGridLayout *grid = new QGridLayout();
                 QHBoxLayout *hbox = new QHBoxLayout();
                 //grid->addWidget(new QLabel("Add series:"), 0, 0);
                 grid->addWidget(addSeriesButton, 0, 1);
                 grid->addWidget(new QLabel("Background:"), 2, 0);
                 grid->addWidget(backgroundCombo, 2, 1);
                 grid->addWidget(m_autoScaleCheck, 3, 0);
                 grid->addWidget(new QLabel("x min:"), 4, 0);
                 grid->addWidget(m_xMinSpin, 4, 1);
                 grid->addWidget(new QLabel("x max:"), 5, 0);
                 grid->addWidget(m_xMaxSpin, 5, 1);
                 grid->addWidget(new QLabel("y min:"), 6, 0);
                 grid->addWidget(m_yMinSpin, 6, 1);
                 grid->addWidget(new QLabel("y max:"), 7, 0);
                 grid->addWidget(m_yMaxSpin, 7, 1);
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), 8, 0);
                 grid->setRowStretch(8, 1);
                 hbox->addLayout(grid);
                 m_chartWidget = new QChartWidget(this);
                 //m_chartWidget->setColor(Qt::red);
                 hbox->addWidget(m_chartWidget);
             //    hbox->setStretch(1, 1);
                 setLayout(hbox);
                 m_autoScaleCheck->setChecked(true);
                 chartTypeChanged(4);
                 testDataChanged(0);
             }
             void MainWidget::addSeries()
             {
                 DataSerieDialog dialog(m_defaultSeries, this);
                 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
                 dialog.exec();
             }
             void MainWidget::addSeries(QString series, QString data)
             {
                 qDebug() << "addSeries: " << series << " data: " << data;
                 m_defaultSeries = series;
                 QXYChartSeries* series0 = QXYChartSeries::create();
                 // TODO: a dedicated data class for storing x and y values
                 QList<qreal> x;
                 QList<qreal> y;
                 if (data == "linear") {
                     for (int i = 0; i < 20; i++) {
                         x.append(i);
                         y.append(i);
                     }
                     for (int i = 0; i < 20; i++)
                         series0->add(i, i);
                 } else if (data == "linear, 1M") {
                     for (int i = 0; i < 10000; i++) {
                         x.append(i);
                         y.append(20);
                     }
                     for (int i = 0; i < 1000000; i++)
                         series0->add(i, 10);
                 } else if (data == "SIN") {
                     for (int i = 0; i < 100; i++) {
                         x.append(i);
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
                     }
                     for (int i = 0; i < 100; i++)
                         series0->add(i, abs(sin(3.14159265358979 / 50 * i) * 100));
                 } else if (data == "SIN + random") {
                     for (qreal i = 0; i < 100; i += 0.1) {
                         x.append(i + (rand() % 5));
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                     }
                     for (qreal i = 0; i < 100; i += 0.1)
                         series0->add(i + (rand() % 5), abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                 } else {
                     // TODO: check if data has a valid file name
                 }
                 // TODO: color of the series
                 if (series == "Scatter") {
                     /*QChartSeries* scatterSeries = */
                     m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
+                } else if (series == "Pie") {
+                    m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypePie);
                 } else if (series == "Line") {
                     m_chartWidget->addSeries(series0);
                 } else {
                     // TODO
                 }
             }
             void MainWidget::chartTypeChanged(int itemIndex)
             {
                 // TODO: change chart type
                 switch (itemIndex) {
                 case 4:
                     //m_chartWidget->setType(4);
                     break;
                 default: {
                     //m_chartWidget->setType(0);
                     break;
                 }
                 }
             }
             void MainWidget::testDataChanged(int itemIndex)
             {
                 qDebug() << "testDataChanged: " << itemIndex;
             //    switch (itemIndex) {
             //    case 0: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 20; x++) {
             //            data.append(QChartDataPoint() << x << x / 2);
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 1: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 100; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 2: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 1000; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    default:
             //        break;
             //    }
             }
             void MainWidget::backgroundChanged(int itemIndex)
             {
                 qDebug() << "backgroundChanged: " << itemIndex;
             }
             void MainWidget::autoScaleChanged(int value)
             {
                 if (value) {
                     // TODO: enable auto scaling
                 } else {
                     // TODO: set scaling manually (and disable auto scaling)
                 }
                 m_xMinSpin->setEnabled(!value);
                 m_xMaxSpin->setEnabled(!value);
                 m_yMinSpin->setEnabled(!value);
                 m_yMaxSpin->setEnabled(!value);
             }
             void MainWidget::xMinChanged(int value)
             {
                 qDebug() << "xMinChanged: " << value;
             }
             void MainWidget::xMaxChanged(int value)
             {
                 qDebug() << "xMaxChanged: " << value;
             }
             void MainWidget::yMinChanged(int value)
             {
                 qDebug() << "yMinChanged: " << value;
             }
             void MainWidget::yMaxChanged(int value)
             {
                 qDebug() << "yMaxChanged: " << value;
             }

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