HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r42:5fcd249308db

Integrated scatter type series...

Tero Ahola -

r42:5fcd249308db

parent child

Context file:

r42:5fcd249308db

Collapse all files

src/qscatterseries.cpp created 644 +67 0

@@ -0,0 +1,67
	1	#include "qscatterseries.h"
	2	#include "qscatterseries_p.h"
	3	#include "qchart.h"
	4	#include <QPainter>
	5	#include <QGraphicsScene>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	//#define QSeriesData QList<qreal>
	10
	11	QScatterSeriesPrivate::QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent) :
	12	QGraphicsItem(parent),
	13	m_x(x),
	14	m_y(y)
	15	{
	16	}
	17
	18	void QScatterSeriesPrivate::setSize()
	19	{
	20	}
	21
	22	QRectF QScatterSeriesPrivate::boundingRect() const
	23	{
	24	return QRectF(0, 0, 100, 100);
	25	}
	26
	27	void QScatterSeriesPrivate::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	28	{
	29	QPen pen = painter->pen();
	30	QBrush brush = pen.brush();
	31	// TODO: The opacity should be user definable...
	32	brush.setColor(QColor(255, 82, 0, 50));
	33	pen.setBrush(brush);
	34	pen.setWidth(4);
	35	painter->setPen(pen);
	36	QTransform transform = painter->transform();
	37
	38	// TODO: get min and max values of the axes from the QChart (or some dedicated class)
	39	const qreal xmin = 0.0;
	40	const qreal xmax = 100.0;
	41	const qreal xscale = scene()->width() / (xmax - xmin);
	42	const qreal ymin = 0.0;
	43	const qreal ymax = 100.0;
	44	const qreal yscale = scene()->height() / (ymax - ymin);
	45
	46	for (int i(0); i < m_x.count() && i < m_y.count(); i++) {
	47	transform.reset();
	48	transform.translate(m_x.at(i) * xscale, m_y.at(i) * yscale);
	49	painter->setTransform(transform);
	50	painter->drawArc(0, 0, 4, 4, 0, 5760);
	51	}
	52	}
	53
	54	QScatterSeries::QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent) :
	55	QChartSeries(parent),
	56	d(new QScatterSeriesPrivate(x, y, qobject_cast<QGraphicsItem *> (parent)))
	57	{
	58	}
	59
	60	QScatterSeries::~QScatterSeries()
	61	{
	62	delete d;
	63	}
	64
	65	#include "moc_qscatterseries.cpp"
	66
	67	QTCOMMERCIALCHART_END_NAMESPACE

src/qscatterseries.h created 644 +29 0

@@ -0,0 +1,29
	1	#ifndef QSCATTERSERIES_H
	2	#define QSCATTERSERIES_H
	3
	4	#include "qchartseries.h"
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7	class QScatterSeriesPrivate;
	8
	9	class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
	10	{
	11	Q_OBJECT
	12	public:
	13	//QScatterSeries(QSeriesData data, QObject chart);
	14	QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *chart = 0);
	15	~QScatterSeries();
	16
	17	public: // from QChartSeries
	18	virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
	19
	20	private:
	21	Q_DECLARE_PRIVATE(QScatterSeries)
	22	Q_DISABLE_COPY(QScatterSeries)
	23	friend class QChart;
	24	QScatterSeriesPrivate *const d;
	25	};
	26
	27	QTCOMMERCIALCHART_END_NAMESPACE
	28
	29	#endif // QSCATTERSERIES_H

src/qscatterseries_p.h created 644 +29 0

@@ -0,0 +1,29
	1	#ifndef QSCATTERSERIESPRIVATE_H
	2	#define QSCATTERSERIESPRIVATE_H
	3
	4	#include "qchartseries.h"
	5	#include <QGraphicsItem>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	/*!
	10	* The PIMPL class of QScatterSeries.
	11	*/
	12	class QScatterSeriesPrivate : public QGraphicsItem
	13	{
	14	public:
	15	QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent);
	16
	17	public: // from QGraphicsItem
	18	void setSize();
	19	QRectF boundingRect() const;
	20	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget);
	21
	22	// TODO: use the chart data class instead of list of x and y values?
	23	QList<qreal> m_x;
	24	QList<qreal> m_y;
	25	};
	26
	27	QTCOMMERCIALCHART_END_NAMESPACE
	28
	29	#endif // QSCATTERSERIES_H

src/qchart.cpp +27 -1

             #include "qchart.h"
             #include "qchartseries.h"
+            #include "qscatterseries.h"
+            #include "qscatterseries_p.h"
             #include "xylinechartitem_p.h"
             #include "xyplotdomain_p.h"
             #include "axis_p.h"
             #include "xygrid_p.h"
+            #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 }
             }
+            QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            {
+                Q_D(QChart);
+                // TODO: support also other types
+                Q_ASSERT(type == QChartSeries::SeriesTypeScatter);
+                QChartSeries *series = 0;
+                switch (type) {
+                case QChartSeries::SeriesTypeScatter: {
+                    QScatterSeries *scatterSeries = new QScatterSeries(x, y, this);
+                    d->m_items.append(scatterSeries->d);
+                    scene()->addItem(scatterSeries->d);
+                    //series = qobject_cast<QChartSeries *>(scatterSeries);
+                    break;
+                }
+                default:
+                    break;
+                }
+                return series;
+            }
             void QChart::setSize(const QSizeF& size)
             {
                 Q_D(QChart);
                 d->m_grid->setPos(d->m_rect.topLeft());
                 d->m_grid->setSize(d->m_rect.size());
                 d->m_plotDataList[0].m_viewportRect = d->m_rect;
+                // TODO: line chart items would need to be updated separately as they don't support update
+                // via paint method
                 foreach(QGraphicsItem* item , d->m_items)
                     reinterpret_cast<XYLineChartItem*>(item)->updateXYPlotData(d->m_plotDataList.at(0));
                 update();
             }
             int QChart::margin() const

src/qchart.h +13 -1

             #define CHART_H
             #include <qchartglobal.h>
+            #include <qchartseries.h>
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class XYPlotDomain;
             class QChartPrivate;
-            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem
+            // TODO: We don't need to have QChart tied to QGraphicsItem:
+            //class QTCOMMERCIALCHART_EXPORT QChart
+            //class QTCOMMERCIALCHART_EXPORT QChartGraphicsItem : public QGraphicsItem {
+            // public: QChartGraphicsItem(QChart &chart);
+            /*!
+             * TODO: define the responsibilities
+             */
+            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsItem, public QObject
             {
             public:
                 virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
                 void addSeries(QChartSeries* series);
+                //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
+                // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
+                QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
                 virtual void setSize(const QSizeF& rect);
                 void setMargin(int margin);

src/qchartwidget.cpp +6 0

                     m_view->setScene(m_scene);
                     m_chart = new QChart();
                     m_scene->addItem(m_chart);
+                    m_view->show();
                 }
                 ~QChartWidgetPrivate() {
                 d->m_chart->addSeries(series);
             }
+            QChartSeries* QChartWidget::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
+            {
+                Q_D(QChartWidget);
+                return d->m_chart->createSeries(x, y, type);
+            }
             #include "moc_qchartwidget.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartwidget.h +2 0

                 void resizeEvent(QResizeEvent *event);
                 QSize sizeHint() const;
+                // TODO: addSeries and createSeries are optional solutions
                 void addSeries(QChartSeries* series);
+                QChartSeries* createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
             protected:
                 QChartWidgetPrivate * const d_ptr;

src/src.pro +3 0

                 xylinechart/xylinechartitem.cpp \
                 xylinechart/xygrid.cpp \
                 xylinechart/xyplotdomain.cpp \
+                qscatterseries.cpp \
                 qchart.cpp \
                 axis.cpp \
                 qchartwidget.cpp
                 xylinechart/xylinechartitem_p.h \
                 xylinechart/xyplotdomain_p.h \
                 xylinechart/xygrid_p.h \
+                qscatterseries_p.h \
                 axis_p.h
             PUBLIC_HEADERS += \
                 qchartseries.h \
+                qscatterseries.h \
                 qchart.h \
                 qchartwidget.h \
                 qchartglobal.h \

test/chartwidgettest/mainwidget.cpp +28 -22

@@ -100,39 +100,45 void MainWidget::addSeries(QString series, QString data)
100	qDebug() << "addSeries: " << series << " data: " << data;	100	qDebug() << "addSeries: " << series << " data: " << data;
101	m_defaultSeries = series;	101	m_defaultSeries = series;
102		102
103	QXYChartSeries* series0 = 0;	103	// TODO: a dedicated data class for storing x and y values
104		104	QList<qreal> x;
105	// TODO: color of the series	105	QList<qreal> y;
106	if (series == "Scatter") {
107	series0 = QXYChartSeries::create();
108	} else if (series == "Line") {
109	series0 = QXYChartSeries::create();
110	} else {
111	// TODO
112	series0 = QXYChartSeries::create();
113	}
114		106
115	if (data == "linear") {	107	if (data == "linear") {
116	for (int i = 0; i < 10; i++)	108	for (int i = 0; i < 10; i++) {
117	~~series0~~->add(i, 10);	109	x.append(i);
		110	y.append(10);
		111	}
118	} else if (data == "linear, 1M") {	112	} else if (data == "linear, 1M") {
119	for (int i = 0; i < 1000000; i++)	113	for (int i = 0; i < 10000; i++) {
120	~~series0~~->add(i, 20);	114	x.append(i);
		115	y.append(20);
		116	}
121	} else if (data == "SIN") {	117	} else if (data == "SIN") {
122	for (int x = 0; x < 100; x++)	118	for (int i = 0; i < 100; i++) {
123	series0->add(x, abs(sin(3.14159265358979 / 50 * x) * 100));	119	x.append(i);
124	QList<QXYChartSeries*> dataset;	120	y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
125	dataset << series0;	121	}
126	} else if (data == "SIN + random") {	122	} else if (data == "SIN + random") {
127	for (qreal x = 0; x < 100; x += 0.1) {	123	for (qreal i = 0; i < 100; i += 0.1) {
128	~~series0~~->add(x + (rand() % 5),	124	x.append(i + (rand() % 5));
129	abs(sin(3.14159265358979 / 50 * x) * 100) + (rand() % 5));	125	y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
130	}	126	}
131	} else {	127	} else {
132	// TODO: check if data has a valid file name	128	// TODO: check if data has a valid file name
133	}	129	}
134		130
		131	// TODO: color of the series
		132	if (series == "Scatter") {
		133	/QChartSeries scatterSeries = */m_chartWidget->createSeries(x, y, QChartSeries::SeriesTypeScatter);
		134	} else if (series == "Line") {
		135	QXYChartSeries* series0 = QXYChartSeries::create();
		136	for (int i = 0; i < 1000000; i++)
		137	series0->add(i, 20);
135	m_chartWidget->addSeries(series0);	138	m_chartWidget->addSeries(series0);
		139	} else {
		140	// TODO
		141	}
136	}	142	}
137		143
138	void MainWidget::chartTypeChanged(int itemIndex)	144	void MainWidget::chartTypeChanged(int itemIndex)

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