HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r470:5c708e3e7c7c

Refactor scatter chart to fit the other classes...

Michal Klocek -

r470:5c708e3e7c7c

parent child

Context file:

r470:5c708e3e7c7c

Expand all files

src/scatterseries/scatterchartitem.cpp created 644 +178 0

@@ -0,0 +1,178
	1	#include "scatterchartitem_p.h"
	2	#include "qscatterseries.h"
	3	#include "chartpresenter_p.h"
	4	#include <QPainter>
	5	#include <QGraphicsScene>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	ScatterChartItem::ScatterChartItem(QScatterSeries series, QGraphicsObject parent) :
	10	XYChartItem(series,parent),
	11	m_series(series),
	12	m_items(this),
	13	m_shape(QScatterSeries::MarkerShapeRectangle),
	14	m_size(10)
	15
	16	{
	17	Q_ASSERT(parent);
	18	Q_ASSERT(series);
	19
	20	connect(m_series,SIGNAL(updated()), this, SLOT(handleUpdated()));
	21
	22	setZValue(ChartPresenter::ScatterSeriesZValue);
	23	setFlags(QGraphicsItem::ItemHasNoContents);
	24	setFlags(QGraphicsItem::ItemClipsChildrenToShape);
	25
	26	handleUpdated();
	27
	28	// TODO: how to draw a drop shadow?
	29	// QGraphicsDropShadowEffect *dropShadow = new QGraphicsDropShadowEffect();
	30	// dropShadow->setOffset(2.0);
	31	// dropShadow->setBlurRadius(2.0);
	32	// setGraphicsEffect(dropShadow);
	33	}
	34
	35
	36	QRectF ScatterChartItem::boundingRect() const
	37	{
	38	return m_rect;
	39	}
	40
	41	void ScatterChartItem::createPoints(int count)
	42	{
	43	for (int i = 0; i < count; ++i) {
	44
	45	QGraphicsItem *item;
	46
	47	switch (m_shape) {
	48	case QScatterSeries::MarkerShapeDefault:
	49	// Fallthrough, defaults to circle
	50	case QScatterSeries::MarkerShapeCircle:
	51	item = new QGraphicsEllipseItem(0,0,m_size,m_size);
	52	break;
	53	case QScatterSeries::MarkerShapeRectangle:
	54	item = new QGraphicsRectItem(0,0,m_size,m_size);
	55	break;
	56	case QScatterSeries::MarkerShapeRoundedRectangle:
	57	//m_path.addRoundedRect(x, y, size, size, size / 4.0, size / 4.0);
	58	break;
	59	case QScatterSeries::MarkerShapeTiltedRectangle:
	60	// TODO: tilt the rectangle
	61	//m_path.addRect(x, y, size, size);
	62	//break;
	63	case QScatterSeries::MarkerShapeTriangle:
	64	//QPolygonF polygon;
	65	//polygon << QPointF(0.0, -size) << QPointF(size / 2.0, 0.0) << QPointF(-size / 2, 0.0);
	66	// TODO: the position is not exactly right...
	67	//m_path.addPolygon(polygon.translated(x + size / 2.0, y + size));
	68	break;
	69	}
	70	m_items.addToGroup(item);
	71	}
	72	}
	73
	74	void ScatterChartItem::deletePoints(int count)
	75	{
	76	QList<QGraphicsItem *> items = m_items.childItems();
	77
	78	for (int i = 0; i < count; ++i) {
	79	delete(items.takeLast());
	80	}
	81	}
	82
	83	/*
	84
	85	void ScatterChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
	86	{
	87
	88	QPointF clickedPoint(
	89	m_minX + (event->lastPos().x() / m_clippingRect.width()) * (m_maxX-m_minX),
	90	m_maxY - (event->lastPos().y() / m_clippingRect.height()) * (m_maxY-m_minY));
	91	emit clicked(clickedPoint);
	92
	93	}
	94	*/
	95
	96	void ScatterChartItem::setGeometry(QVector<QPointF>& points)
	97	{
	98	if(points.size()==0) return;
	99
	100	int diff = XYChartItem::points().size() - points.size();
	101
	102	if(diff>0) {
	103	deletePoints(diff);
	104	}
	105	else if(diff<0) {
	106	createPoints(-diff);
	107	}
	108
	109	if(diff!=0) handleUpdated();
	110
	111	QList<QGraphicsItem*> items = m_items.childItems();
	112
	113	for(int i=0; i< points.size();i++) {
	114	QGraphicsItem* item = items.at(i);
	115	const QPointF& point = points.at(i);
	116	item->setPos(point.x()-1,point.y()-1);
	117	if(!clipRect().contains(point)) {
	118	item->setVisible(false);
	119	}
	120	else {
	121	item->setVisible(true);
	122	}
	123	}
	124
	125	prepareGeometryChange();
	126	m_rect = clipRect();
	127	XYChartItem::setGeometry(points);
	128	}
	129
	130
	131	void ScatterChartItem::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	132	{
	133	Q_UNUSED(painter);
	134	Q_UNUSED(option);
	135	Q_UNUSED(widget);
	136	}
	137
	138	void ScatterChartItem::setPen(const QPen& pen)
	139	{
	140	foreach(QGraphicsItem* item , m_items.childItems()) {
	141	static_cast<QAbstractGraphicsShapeItem*>(item)->setPen(pen);
	142	}
	143	}
	144
	145	void ScatterChartItem::setBrush(const QBrush& brush)
	146	{
	147	foreach(QGraphicsItem* item , m_items.childItems()) {
	148	static_cast<QAbstractGraphicsShapeItem*>(item)->setBrush(brush);
	149	}
	150	}
	151
	152	void ScatterChartItem::handleUpdated()
	153	{
	154
	155	int count = m_items.childItems().count();
	156
	157	if(count==0) return;
	158
	159	bool recreate = m_size != m_series->size() \|\| m_shape != m_series->shape();
	160
	161	//TODO: only rewrite on size change
	162
	163	m_size = m_series->size();
	164	m_shape = m_series->shape();
	165
	166	if(recreate){
	167	deletePoints(count);
	168	createPoints(count);
	169	}
	170
	171	setPen(m_series->pen());
	172	setBrush(m_series->brush());
	173
	174	}
	175
	176	#include "moc_scatterchartitem_p.cpp"
	177
	178	QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterchartitem_p.h created 644 +50 0

@@ -0,0 +1,50
	1	#ifndef SCATTERPRESENTER_H
	2	#define SCATTERPRESENTER_H
	3
	4	#include "qchartglobal.h"
	5	#include "xychartitem_p.h"
	6	#include <QObject>
	7	#include <QPen>
	8
	9	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	10
	11	class QScatterSeries;
	12
	13	class ScatterChartItem : public XYChartItem
	14	{
	15	Q_OBJECT
	16	public:
	17	explicit ScatterChartItem(QScatterSeries series, QGraphicsObject parent = 0);
	18
	19	public:
	20	//from QGraphicsItem
	21	QRectF boundingRect() const;
	22	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget);
	23
	24	void setPen(const QPen& pen);
	25	void setBrush(const QBrush& brush);
	26
	27	signals:
	28	void clicked(QPointF coordinates);
	29
	30	public slots:
	31	void handleUpdated();
	32
	33	private:
	34	void createPoints(int count);
	35	void deletePoints(int count);
	36
	37	protected:
	38	virtual void setGeometry(QVector<QPointF>& points);
	39
	40	private:
	41	QScatterSeries *m_series;
	42	QGraphicsItemGroup m_items;
	43	int m_shape;
	44	int m_size;
	45	QRectF m_rect;
	46	};
	47
	48	QTCOMMERCIALCHART_END_NAMESPACE
	49
	50	#endif // SCATTERPRESENTER_H

example/scatter/main.cpp +6 -5

                 // And more
                 //! [2]
-                *scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
+               // *scatter << QPointF(2.0, 5.5) << QPointF(2.2, 5.4);
                 //! [2]
                 //! [3]
-                QBrush brush(QColor(255, 0, 0, 80), Qt::SolidPattern);
+                QBrush brush(Qt::red);
                 scatter->setBrush(brush);
-                QPen pen(QColor(0, 255, 0, 60), 3);
+                QPen pen(Qt::black);
+                pen.setWidth(3);
                 scatter->setPen(pen);
-                scatter->setShape(QScatterSeries::MarkerShapeRectangle);
+                scatter->setShape(QScatterSeries::MarkerShapeCircle);
                 scatter->setSize(25.0);
                 //! [3]
                 QMainWindow w;
                 w.resize(400, 300);
                 w.setCentralWidget(chartView);
-                w.setWindowFlags(Qt::FramelessWindowHint);
+               // w.setWindowFlags(Qt::FramelessWindowHint);
                 w.show();
                 return a.exec();

example/scatterinteractions/mainwindow.cpp +3 0

             void MainWindow::clickPoint(QPointF coordinate)
             {
                 // Remove the clicked point from the series and add points to the two other series we have
+                //TODO: fix me
+                /*
                 int index = m_scatter->closestPoint(coordinate);
                 QPointF point = m_scatter->data().at(index);
                 Q_ASSERT(m_scatter->removeAt(index));
                 *m_scatter2 << point;
                 point.ry() -= 0.25;
                 *m_scatter3 << point;
+                */
             }

src/chartdataset.cpp +17 -39

@@ -126,14 +126,26 void ChartDataSet::calculateDomain(QSeries* series,Domain* domain) const
126	{	126	{
127	switch(series->type())	127	switch(series->type())
128	{	128	{
129	case QSeries::SeriesTypeLine: {	129	case QSeries::SeriesTypeLine:
		130	case QSeries::SeriesTypeSpline:
		131	case QSeries::SeriesTypeScatter:
		132	{
130		133
131	Q~~Line~~Series* ~~line~~Series = static_cast<Q~~Line~~Series*>(series);	134	QXYSeries* xySeries = static_cast<QXYSeries*>(series);
132		135
133	for (int i = 0; i < lineSeries->count(); i++)	136	qreal minX(domain->minX());
		137	qreal minY(domain->minY());
		138	qreal maxX(domain->maxX());
		139	qreal maxY(domain->maxY());
		140
		141	for (int i = 0; i < xySeries->count(); i++)
134	{	142	{
135	qreal x = ~~line~~Series->x(i);	143	qreal x = xySeries->x(i);
136	qreal y = ~~line~~Series->y(i);	144	qreal y = xySeries->y(i);
		145	minX = qMin(minX, x);
		146	minY = qMin(minY, y);
		147	maxX = qMax(maxX, x);
		148	maxY = qMax(maxY, y);
137	domain->setMinX(qMin(domain->minX(),x));	149	domain->setMinX(qMin(domain->minX(),x));
138	domain->setMinY(qMin(domain->minY(),y));	150	domain->setMinY(qMin(domain->minY(),y));
139	domain->setMaxX(qMax(domain->maxX(),x));	151	domain->setMaxX(qMax(domain->maxX(),x));
@@ -210,40 +222,6 void ChartDataSet::calculateDomain(QSeries* series,Domain* domain) const
210	break;	222	break;
211	}	223	}
212		224
213	case QSeries::SeriesTypeScatter: {
214	QScatterSeries scatterSeries = qobject_cast<QScatterSeries >(series);
215	Q_ASSERT(scatterSeries);
216	qreal minX(domain->minX());
217	qreal minY(domain->minY());
218	qreal maxX(domain->maxX());
219	qreal maxY(domain->maxY());
220	foreach (QPointF point, scatterSeries->data()) {
221	minX = qMin(minX, point.x());
222	minY = qMin(minY, point.y());
223	maxX = qMax(maxX, point.x());
224	maxY = qMax(maxY, point.y());
225	}
226	domain->setMinX(minX);
227	domain->setMinY(minY);
228	domain->setMaxX(maxX);
229	domain->setMaxY(maxY);
230	break;
231	}
232
233	case QSeries::SeriesTypeSpline: {
234	QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series);
235
236	for (int i = 0; i < splineSeries->count(); i++)
237	{
238	qreal x = splineSeries->x(i);
239	qreal y = splineSeries->y(i);
240	domain->setMinX(qMin(domain->minX(),x));
241	domain->setMinY(qMin(domain->minY(),y));
242	domain->setMaxX(qMax(domain->maxX(),x));
243	domain->setMaxY(qMax(domain->maxY(),y));
244	}
245	break;
246	}
247		225
248	default: {	226	default: {
249	qDebug()<<__FUNCTION__<<"type" << series->type()<<"not supported";	227	qDebug()<<__FUNCTION__<<"type" << series->type()<<"not supported";

src/chartpresenter.cpp +2 -2

             #include "linechartitem_p.h"
             #include "linechartanimationitem_p.h"
             #include "piepresenter_p.h"
-            #include "scatterpresenter_p.h"
+            #include "scatterchartitem_p.h"
             #include "splinechartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 }
                 case QSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
-                    ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
+                    ScatterChartItem *scatterPresenter = new ScatterChartItem(scatterSeries, m_chart);
                     QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
                                      scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),

src/charttheme.cpp +6 -6

             #include "percentbarpresenter_p.h"
             #include "linechartitem_p.h"
             #include "areachartitem_p.h"
-            #include "scatterpresenter_p.h"
+            #include "scatterchartitem_p.h"
             #include "piepresenter_p.h"
             #include "splinechartitem_p.h"
                     case QSeries::SeriesTypeScatter: {
                         QScatterSeries* s = qobject_cast<QScatterSeries*>(series);
                         Q_ASSERT(s);
-                        ScatterPresenter* i = static_cast<ScatterPresenter*>(item);
+                        ScatterChartItem* i = static_cast<ScatterChartItem*>(item);
                         Q_ASSERT(i);
                         decorate(i, s, count);
                         break;
                 }
             }
-            void ChartTheme::decorate(ScatterPresenter* presenter, QScatterSeries* series, int count)
+            void ChartTheme::decorate(ScatterChartItem* item, QScatterSeries* series, int count)
             {
-                Q_ASSERT(presenter);
+                Q_ASSERT(item);
                 Q_ASSERT(series);
                 QColor color = m_seriesColor.at(count % m_seriesColor.size());
                 //color.setAlpha(120);
                 QBrush brush(color, Qt::SolidPattern);
-                presenter->m_markerBrush = brush;
+                item->setBrush(Qt::blue);
                 QPen pen(brush, 3);
                 pen.setColor(color);
-                presenter->m_markerPen = pen;
+                item->setPen(pen);
             }
             void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int /*count*/)

src/charttheme_p.h +2 -2

             class QPercentBarSeries;
             class PercentBarPresenter;
             class QScatterSeries;
-            class ScatterPresenter;
+            class ScatterChartItem;
             class PiePresenter;
             class QPieSeries;
             class SplineChartItem;
                 void decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count);
                 void decorate(LineChartItem* item, QLineSeries* series,int count);
                 void decorate(AreaChartItem* item, QAreaSeries* series,int count);
-                void decorate(ScatterPresenter* presenter, QScatterSeries* series, int count);
+                void decorate(ScatterChartItem* presenter, QScatterSeries* series, int count);
                 void decorate(PiePresenter* item, QPieSeries* series, int count);
                 void decorate(QChartAxis* axis,AxisItem* item);
                 void decorate(SplineChartItem* presenter, QSplineSeries* series, int count);

src/linechart/linechartitem_p.h +5 -4

             {
                  Q_OBJECT
             public:
-                LineChartItem(QLineSeries* series,QGraphicsItem *parent = 0);
+                 explicit LineChartItem(QLineSeries* series,QGraphicsItem *parent = 0);
                 ~ LineChartItem(){};
                 //from QGraphicsItem
                 void setPen(const QPen& pen);
                 void setPointsVisible(bool visible);
-                void createPoints(int count);
-                void deletePoints(int count);
             public slots:
                 void handleUpdated();
                 virtual void setGeometry(QVector<QPointF>& points);
             private:
+                void createPoints(int count);
+                void deletePoints(int count);
+            private:
                 QLineSeries* m_series;
                 QGraphicsItemGroup m_items;
                 QPainterPath m_path;

src/linechart/qlineseries.cpp +29 -25

@@ -30,53 +30,57 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30	*/	30	*/
31		31
32	/*!	32	/*!
33	\fn ~~QPen~~ QLineSeries::pen() const	33	\fn bool QLineSeries::pointsVisible() const
34	\brief Returns the pen used to draw line for this series.
35	\sa setPen()
36	*/
37
38	/*!
39	\fn bool QLineSeries::pointsVisible() const
40	\brief Returns if the points are drawn for this series.	34	\brief Returns if the points are drawn for this series.
41	\sa setPointsVisible()	35	\sa setPointsVisible()
42	*/	36	*/
43		37
44
45	/*!
46	\fn void QLineSeries::pointReplaced(int index)
47	\brief \internal \a index
48	*/
49
50	/*!	38	/*!
51	\fn void QLineSeries::pointAdded(int index)	39	\fn QPen QLineSeries::linePen() const
52	\brief \internal \a index	40	\brief Returns the pen used to draw line connecting points.
		41	\sa setPen()
53	*/	42	*/
54		43
55	/*!	44	/*!
56	\fn void QLineSeries::pointRemoved(int index)	45	Constructs empty series object which is a child of \a parent.
57	\brief \internal \a index	46	When series object is added to QChartView or QChart instance ownerships is transfered.
58	*/	47	*/
		48	QLineSeries::QLineSeries(QObject* parent):QXYSeries(parent),
		49	m_pointsVisible(false)
		50	{
59		51
		52	}
60	/*!	53	/*!
61	\fn void QLineSeries::updated()	54	Destroys the object. Series added to QChartView or QChart instances are owned by those,
62	\brief \internal	55	and are deleted when mentioned object are destroyed.
63	*/	56	*/
		57	QLineSeries::~QLineSeries()
		58	{
		59	}
64		60
65	/*!	61	/*!
66	Constructs empty series object which is a child of \a parent.	62	Sets \a pen used for drawing line connecting points.
67	When series object is added to QChartView or QChart instance ownerships is transfered.
68	*/	63	*/
69	QLineSeries::QLineSeries(QObject* parent):QXYSeries(parent)	64	void QLineSeries::setLinePen(const QPen& pen)
70	{	65	{
		66	if(pen!=m_pen){
		67	m_pen=pen;
		68	emit updated();
		69	}
71	}	70	}
		71
72	/*!	72	/*!
73	Destroys the object. Series added to QChartView or QChart instances are owned by those,	73	Sets if data points are \a visible and should be drawn on line.
74	and are deleted when mentioned object are destroyed.
75	*/	74	*/
76	QLineSeries::~QLineSeries()	75	void QLineSeries::setPointsVisible(bool visible)
77	{	76	{
		77	if(m_pointsVisible!=visible){
		78	m_pointsVisible=visible;
		79	emit updated();
		80	}
78	}	81	}
79		82
		83
80	QDebug operator<< (QDebug debug, const QLineSeries series)	84	QDebug operator<< (QDebug debug, const QLineSeries series)
81	{	85	{
82	Q_ASSERT(series.m_x.size() == series.m_y.size());	86	Q_ASSERT(series.m_x.size() == series.m_y.size());

src/linechart/qlineseries.h +9 0

             	QLineSeries(QObject* parent=0);
             	virtual ~QLineSeries();
+            	void setLinePen(const QPen& pen);
+            	QPen linePen() const {return m_pen;}
+            	void setPointsVisible(bool visible);
+            	bool pointsVisible() const {return m_pointsVisible;}
             public: // from QChartSeries
             	virtual QSeriesType type() const {return QSeries::SeriesTypeLine;}
                 friend QDebug operator<< (QDebug d, const QLineSeries series);
+            private:
+                QPen m_pen;
+                bool m_pointsVisible;
             };

src/scatterseries/qscatterseries.cpp +22 -121

             #include "qscatterseries.h"
-            #include "scatterseries_p.h"
             #include "qchart.h"
             /*!
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QScatterSeriesPrivate::QScatterSeriesPrivate(QObject *parent) :
-                QObject(parent),
-                m_data(QList<QPointF>()),
-                m_markerPen(QPen(QColor::Invalid)),
-                m_markerBrush(QBrush(QColor::Invalid)),
-                m_markerShape(QScatterSeries::MarkerShapeDefault),
-                m_markerSize(9.0)
-            void QScatterSeriesPrivate::emitChanged()
-                emit changed();
-            #include "moc_scatterseries_p.cpp"
             /*!
                 Constructs a series object which is a child of \a parent.
             */
             QScatterSeries::QScatterSeries(QObject *parent) :
-                QSeries(parent),
+                QXYSeries(parent),
-                d(new QScatterSeriesPrivate(this))
+                m_shape(QScatterSeries::MarkerShapeDefault),
+                m_size(9.0)
             {
             }
             */
             QScatterSeries::~QScatterSeries()
             {
-                delete d;
             }
-            /*!
-                Add single data point with \a x and \a y coordinates to the series.
-            */
-            void QScatterSeries::add(qreal x, qreal y)
-                d->m_data.append(QPointF(x, y));
-                d->emitChanged();
-            /*!
-                Add single data point with \a value to the series.
-            */
-            void QScatterSeries::add(QPointF value)
-                d->m_data.append(value);
-                d->emitChanged();
-            /*!
-                Add list of \a points to the series.
-            */
-            void QScatterSeries::add(QList<QPointF> points)
-                d->m_data.append(points);
-                d->emitChanged();
             /*!
                 Stream operator for adding a data point with \a value to the series.
                 For example:
                 \snippet ../example/scatter/main.cpp 2
             */
-            QScatterSeries& QScatterSeries::operator << (const QPointF &value)
-                d->m_data.append(value);
-                d->emitChanged();
-                return *this;
             /*!
                 Stream operator for adding a list of points to the series.
                 \sa add()
             */
-            QScatterSeries& QScatterSeries::operator << (QList<QPointF> value)
-                d->m_data.append(value);
-                d->emitChanged();
-                return *this;
             /*!
                 Replaces the data of the series with the given list of data \a points.
             */
-            void QScatterSeries::setData(QList<QPointF> points)
-                d->m_data = points;
-                d->emitChanged();
             /*!
                 Returns the current list of data points of the series.
             */
-            QList<QPointF> QScatterSeries::data()
-                return d->m_data;
             /*!
                 Replaces the point at \a index with \a newPoint. Returns true if \a index is a valid position
                 in the series data, false otherwise.
             */
-            bool QScatterSeries::replace(int index, QPointF newPoint)
-                if (index >= 0 && index < d->m_data.count()) {
-                    d->m_data.replace(index, newPoint);
-                    d->emitChanged();
-                    return true;
-                return false;
             /*!
                 Remove the data point at \a index. Returns true if a point was removed, false if the point
                 at \a index does not exist on the series.
             */
-            bool QScatterSeries::removeAt(int index)
-                if (index >=0 && index < d->m_data.count()) {
-                    d->m_data.removeAt(index);
-                    d->emitChanged();
-                    return true;
-                return false;
             /*!
                 Remove all occurrences of \a point from the series and returns the number of points removed.
             */
-            int QScatterSeries::removeAll(QPointF point)
-                int count = d->m_data.removeAll(point);
-                d->emitChanged();
-                return count;
             /*!
                 Remove all data points from the series.
             */
-            void QScatterSeries::clear()
-                d->m_data.clear();
-                d->emitChanged();
             /*!
                 Returns the index of the data point that is closest to \a coordinate. If several data points
                 are at the same distance from the \a coordinate, returns the last one. If no points exist,
                 returns -1.
-            */
             int QScatterSeries::closestPoint(QPointF coordinate)
             {
                 qreal distance(-1);
                 }
                 return pointIndex;
             }
+            */
             /*!
                 Returns the pen used for drawing markers.
             */
-            QPen QScatterSeries::pen() const
-                return d->m_markerPen;
             /*!
                 Overrides the default pen used for drawing a marker item with a user defined \a pen. The
                 \sa setBrush()
                 \sa QChart::setChartTheme()
             */
-            void QScatterSeries::setPen(const QPen &pen)
-                d->m_markerPen = pen;
-                d->emitChanged();
             /*!
                 Returns the brush used for drawing markers.
             */
-            QBrush QScatterSeries::brush() const
-                return d->m_markerBrush;
             /*!
                 Overrides the default brush of the marker items with a user defined \a brush. The default brush
                 \sa setPen()
                 \sa QChart::setChartTheme()
             */
-            void QScatterSeries::setBrush(const QBrush &brush)
-                d->m_markerBrush = brush;
-                d->emitChanged();
             /*!
                 Returns the shape used for drawing markers.
             */
             QScatterSeries::MarkerShape QScatterSeries::shape() const
             {
-                return (QScatterSeries::MarkerShape) d->m_markerShape;
+                return (QScatterSeries::MarkerShape) m_shape;
             }
             /*!
             */
             void QScatterSeries::setShape(MarkerShape shape)
             {
-                d->m_markerShape = shape;
+                m_shape = shape;
-                d->emitChanged();
+                emit updated();
             }
             /*!
             */
             qreal QScatterSeries::size() const
             {
-                return d->m_markerSize;
+                return m_size;
             }
             /*!
             */
             void QScatterSeries::setSize(qreal size)
             {
-                d->m_markerSize = size;
+                m_size = size;
-                d->emitChanged();
+                emit updated();
             }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/qscatterseries.h +7 -24

             #ifndef QSCATTERSERIES_H
             #define QSCATTERSERIES_H
-            #include "qseries.h"
+            #include "qchartglobal.h"
+            #include "qxyseries.h"
             #include <QRectF>
             #include <QColor>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QSeries
+            class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries
             {
                 Q_OBJECT
                 QSeriesType type() const { return QSeries::SeriesTypeScatter; }
             public:
-                void add(qreal x, qreal y);
+                //int closestPoint(QPointF coordinate);
-                void add(QPointF value);
-                void add(QList<QPointF> points);
-                void setData(QList<QPointF> points);
-                QScatterSeries& operator << (const QPointF &value);
-                QScatterSeries& operator << (QList<QPointF> points);
-                QList<QPointF> data();
-                bool replace(int index, QPointF newPoint);
-                bool removeAt(int index);
-                int removeAll(QPointF point);
-                void clear();
-                int closestPoint(QPointF coordinate);
-                //TODO: insert, replace...?
-                QPen pen() const;
-                void setPen(const QPen &pen);
-                QBrush brush() const;
-                void setBrush(const QBrush &brush);
                 MarkerShape shape() const;
                 void setShape(MarkerShape shape);
                 qreal size() const;
                 void setSize(qreal size);
-            Q_SIGNALS:
+            signals:
                 void clicked(QPointF coordinate);
             private:
-                Q_DECLARE_PRIVATE(QScatterSeries)
+                MarkerShape m_shape;
-                Q_DISABLE_COPY(QScatterSeries)
+                qreal m_size;
-                friend class ScatterPresenter;
-                QScatterSeriesPrivate *d;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatter.pri +2 -3

             SOURCES += \
                 $$PWD/qscatterseries.cpp \
-                $$PWD/scatterpresenter.cpp
+                $$PWD/scatterchartitem.cpp
             PRIVATE_HEADERS += \
-                $$PWD/scatterpresenter_p.h \
+                $$PWD/scatterchartitem_p.h
-                $$PWD/scatterseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qscatterseries.h

src/splinechart/qsplineseries.cpp +1 -1

               */
             QSplineSeries::QSplineSeries(QObject *parent) :
-                QXYSeries(parent)
+                QLineSeries(parent)
             {
                 connect(this,SIGNAL(pointAdded(int)), this, SLOT(updateControlPoints()));
                 connect(this,SIGNAL(pointRemoved(int)), this, SLOT(updateControlPoints()));

src/splinechart/qsplineseries.h +2 -2

             #include "qchartglobal.h"
             #include <QtGlobal>
-            #include "qxyseries.h"
+            #include "qlineseries.h"
             #include <QList>
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QTCOMMERCIALCHART_EXPORT QSplineSeries : public QXYSeries
+            class QTCOMMERCIALCHART_EXPORT QSplineSeries : public QLineSeries
             {
                 Q_OBJECT
             public:

src/xychart/qxyseries.cpp +12 -35

             /*!
                 \class QXYSeries
-                \brief The QXYSeries class is used for making line charts.
+                \brief The QXYSeries class is a base class for line, spline and scatter series.
-                \mainclass
-            	A line chart is used to show information as a series of data points
-            	connected by straight lines.
-            	\image linechart.png
-            	Creating basic line chart is simple:
-            	\code
-            	QXYSeries* series = new QXYSeries();
-            	series->add(0, 6);
-            	series->add(2, 4);
-            	...
-            	chartView->addSeries(series);
-                \endcode
             */
             /*!
             /*!
                \fn QPen QXYSeries::pen() const
-               \brief  Returns the pen used to draw line for this series.
+               \brief  Returns the pen used to draw points for this series.
                 \sa setPen()
             */
             /*!
-               \fn bool  QXYSeries::pointsVisible() const
-               \brief  Returns if the points are drawn for this series.
-                \sa setPointsVisible()
-            */
-            /*!
                 \fn void QXYSeries::pointReplaced(int index)
                 \brief \internal \a index
             */
                 Constructs empty series object which is a child of \a parent.
                 When series object is added to QChartView or QChart instance ownerships is transfered.
             */
-            QXYSeries::QXYSeries(QObject* parent):QSeries(parent),
+            QXYSeries::QXYSeries(QObject* parent):QSeries(parent)
-            m_pointsVisible(false)
             {
             }
             /*!
             }
             /*!
-                Sets \a pen used for drawing given series..
+                Sets \a pen used for points on the chart.
             */
             void QXYSeries::setPen(const QPen& pen)
             {
                 if(pen!=m_pen){
-                m_pen=pen;
+                    m_pen=pen;
-                emit updated();
+                    emit updated();
                 }
             }
             /*!
-                Sets if data points are \a visible and should be drawn on line.
+                Sets \a brush used for points on the chart.
             */
-            void QXYSeries::setPointsVisible(bool visible)
+            void QXYSeries::setBrush(const QBrush& brush)
             {
-                if(m_pointsVisible!=visible){
+                if(brush!=m_brush){
-                m_pointsVisible=visible;
+                    m_brush=brush;
-                emit updated();
+                    emit updated();
                 }
             }

src/xychart/qxyseries.h +11 -5

             class QTCOMMERCIALCHART_EXPORT QXYSeries : public QSeries
             {
             	Q_OBJECT
-            public:
+            protected:
             	QXYSeries(QObject* parent=0);
             	virtual ~QXYSeries();
             	qreal y(int pos) const;
             	QXYSeries& operator << (const QPointF &point);
+            	/*
+            	void add(QList<QPointF> points);
+                void setData(QList<QPointF> points);
+                QScatterSeries& operator << (const QPointF &value);
+                QScatterSeries& operator << (QList<QPointF> points);
+               int removeAll(QPointF point);
+            	*/
             	void setPen(const QPen& pen);
             	QPen pen() const {return m_pen;}
+                void setBrush(const QBrush& pen);
-            	void setPointsVisible(bool visible);
+                QBrush brush() const {return m_brush;}
-            	bool pointsVisible() const {return m_pointsVisible;}
             signals:
             	void updated();
             	QVector<qreal> m_y;
             	QPen m_pen;
-            	bool m_pointsVisible;
+            	QBrush m_brush;
             };

src/xychart/xychartitem_p.h +1 -1

             {
                  Q_OBJECT
             public:
-                XYChartItem(QXYSeries* series,QGraphicsItem *parent = 0);
+                 explicit XYChartItem(QXYSeries* series,QGraphicsItem *parent = 0);
                 ~ XYChartItem(){};
                 QVector<QPointF> points() const {return m_points;}

src/scatterseries/scatterpresenter.cpp removed 0 -166

NO CONTENT: file was removed

src/scatterseries/scatterpresenter_p.h removed 0 -51

NO CONTENT: file was removed

src/scatterseries/scatterseries_p.h removed 0 -37

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