HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2805:42870bd3de5c

Add a method to remove more than one point to QXYSeries...

Miikka Heikkinen -

r2805:42870bd3de5c

parent child

Context file:

r2805:42870bd3de5c

Expand all files

tests/auto/qml-qtquicktest/tst_xyseries_2_0.qml created 644 +260 0

@@ -0,0 +1,260
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2015 The Qt Company Ltd
	4	** All rights reserved.
	5	** For any questions to The Qt Company, please use contact form at http://qt.io
	6	**
	7	** This file is part of the Qt Charts module.
	8	**
	9	** Licensees holding valid commercial license for Qt may use this file in
	10	** accordance with the Qt License Agreement provided with the Software
	11	** or, alternatively, in accordance with the terms contained in a written
	12	** agreement between you and The Qt Company.
	13	**
	14	** If you have questions regarding the use of this file, please use
	15	** contact form at http://qt.io
	16	**
	17	****************************************************************************/
	18
	19	import QtQuick 2.0
	20	import QtTest 1.0
	21	import QtCharts 2.0
	22
	23	Rectangle {
	24	width: 400
	25	height: 300
	26
	27	TestCase {
	28	id: tc1
	29	name: "tst_qml-qtquicktest XY Series"
	30	when: windowShown
	31
	32	function test_properties() {
	33	verify(lineSeries.color != undefined);
	34	compare(lineSeries.pointsVisible, false);
	35	compare(lineSeries.capStyle, Qt.SquareCap);
	36	compare(lineSeries.style, Qt.SolidLine);
	37	compare(lineSeries.width, 2.0);
	38
	39	verify(splineSeries.color != undefined);
	40	compare(splineSeries.pointsVisible, false);
	41	compare(splineSeries.capStyle, Qt.SquareCap);
	42	compare(splineSeries.style, Qt.SolidLine);
	43	compare(splineSeries.width, 2.0);
	44
	45	verify(scatterSeries.color != undefined);
	46	verify(scatterSeries.borderColor != undefined);
	47	compare(scatterSeries.borderWidth, 2.0);
	48	compare(scatterSeries.markerShape, ScatterSeries.MarkerShapeCircle);
	49	compare(scatterSeries.markerSize, 15.0);
	50	compare(scatterSeries.brushFilename, "");
	51
	52	verify(areaSeries.color != undefined);
	53	verify(areaSeries.borderColor != undefined);
	54	compare(areaSeries.borderWidth, 2.0);
	55	compare(areaSeries.brushFilename, "");
	56	}
	57
	58	function test_axes() {
	59	// Axis initialization
	60	compare(chartView.axisX(), lineSeries.axisX);
	61	compare(chartView.axisY(), lineSeries.axisY);
	62	compare(lineSeries.axisX, splineSeries.axisX);
	63	compare(lineSeries.axisY, splineSeries.axisY);
	64	compare(lineSeries.axisX, areaSeries.axisX);
	65	compare(lineSeries.axisY, areaSeries.axisY);
	66	}
	67
	68	function test_append() {
	69	lineSeriesPointAddedSpy.clear();
	70	splineSeriesPointAddedSpy.clear();
	71	scatterSeriesPointAddedSpy.clear();
	72	var count = append();
	73	compare(lineSeries.count, count);
	74	compare(splineSeries.count, count);
	75	compare(scatterSeries.count, count);
	76	compare(lineSeriesPointAddedSpy.count, count);
	77	compare(splineSeriesPointAddedSpy.count, count);
	78	compare(scatterSeriesPointAddedSpy.count, count);
	79	clear();
	80	compare(lineSeries.count, 0);
	81	compare(splineSeries.count, 0);
	82	compare(scatterSeries.count, 0);
	83	}
	84
	85	function test_replace() {
	86	var count = append();
	87	for (var i = 0; i < count; i++) {
	88	lineSeries.replace(lineSeries.at(i).x, lineSeries.at(i).y, i, Math.random());
	89	splineSeries.replace(splineSeries.at(i).x, splineSeries.at(i).y, i, Math.random());
	90	scatterSeries.replace(scatterSeries.at(i).x, scatterSeries.at(i).y, i, Math.random());
	91	}
	92	compare(lineSeries.count, count);
	93	compare(splineSeries.count, count);
	94	compare(scatterSeries.count, count);
	95	compare(lineSeriesPointReplacedSpy.count, count);
	96	compare(splineSeriesPointReplacedSpy.count, count);
	97	compare(scatterSeriesPointReplacedSpy.count, count);
	98	clear();
	99	}
	100
	101	function test_insert() {
	102	var count = append();
	103	lineSeriesPointAddedSpy.clear();
	104	splineSeriesPointAddedSpy.clear();
	105	scatterSeriesPointAddedSpy.clear();
	106	for (var i = 0; i < count; i++) {
	107	lineSeries.insert(i * 2, i, Math.random());
	108	splineSeries.insert(i * 2, i, Math.random());
	109	scatterSeries.insert(i * 2, i, Math.random());
	110	}
	111	compare(lineSeries.count, count * 2);
	112	compare(splineSeries.count, count * 2);
	113	compare(scatterSeries.count, count * 2);
	114	compare(lineSeriesPointAddedSpy.count, count);
	115	compare(splineSeriesPointAddedSpy.count, count);
	116	compare(scatterSeriesPointAddedSpy.count, count);
	117	clear();
	118	}
	119
	120	function test_remove() {
	121	lineSeriesPointRemovedSpy.clear();
	122	splineSeriesPointRemovedSpy.clear();
	123	scatterSeriesPointRemovedSpy.clear();
	124	var count = append();
	125	for (var i = 0; i < count; i++) {
	126	lineSeries.remove(lineSeries.at(0).x, lineSeries.at(0).y);
	127	splineSeries.remove(splineSeries.at(0).x, splineSeries.at(0).y);
	128	scatterSeries.remove(scatterSeries.at(0).x, scatterSeries.at(0).y);
	129	}
	130	compare(lineSeries.count, 0);
	131	compare(splineSeries.count, 0);
	132	compare(scatterSeries.count, 0);
	133	compare(lineSeriesPointRemovedSpy.count, count);
	134	compare(splineSeriesPointRemovedSpy.count, count);
	135	compare(scatterSeriesPointRemovedSpy.count, count);
	136	}
	137
	138	// Not a test function, called from test functions
	139	function append() {
	140	var count = 100;
	141	chartView.axisX().min = 0;
	142	chartView.axisX().max = 100;
	143	chartView.axisY().min = 0;
	144	chartView.axisY().max = 1;
	145
	146	for (var i = 0; i < count; i++) {
	147	lineSeries.append(i, Math.random());
	148	splineSeries.append(i, Math.random());
	149	scatterSeries.append(i, Math.random());
	150	}
	151
	152	return count;
	153	}
	154
	155	// Not a test function, called from test functions
	156	function clear() {
	157	lineSeries.clear();
	158	splineSeries.clear();
	159	scatterSeries.clear();
	160	}
	161	}
	162
	163	ChartView {
	164	id: chartView
	165	anchors.fill: parent
	166
	167	LineSeries {
	168	id: lineSeries
	169	name: "line"
	170
	171	SignalSpy {
	172	id: lineSeriesPointAddedSpy
	173	target: lineSeries
	174	signalName: "pointAdded"
	175	}
	176
	177	SignalSpy {
	178	id: lineSeriesPointReplacedSpy
	179	target: lineSeries
	180	signalName: "pointReplaced"
	181	}
	182
	183	SignalSpy {
	184	id: lineSeriesPointsReplacedSpy
	185	target: lineSeries
	186	signalName: "pointsReplaced"
	187	}
	188
	189	SignalSpy {
	190	id: lineSeriesPointRemovedSpy
	191	target: lineSeries
	192	signalName: "pointRemoved"
	193	}
	194	}
	195
	196	AreaSeries {
	197	id: areaSeries
	198	name: "area"
	199	upperSeries: lineSeries
	200	}
	201
	202	SplineSeries {
	203	id: splineSeries
	204	name: "spline"
	205
	206	SignalSpy {
	207	id: splineSeriesPointAddedSpy
	208	target: splineSeries
	209	signalName: "pointAdded"
	210	}
	211
	212	SignalSpy {
	213	id: splineSeriesPointReplacedSpy
	214	target: splineSeries
	215	signalName: "pointReplaced"
	216	}
	217
	218	SignalSpy {
	219	id: splineSeriesPointsReplacedSpy
	220	target: splineSeries
	221	signalName: "pointsReplaced"
	222	}
	223
	224	SignalSpy {
	225	id: splineSeriesPointRemovedSpy
	226	target: splineSeries
	227	signalName: "pointRemoved"
	228	}
	229	}
	230
	231	ScatterSeries {
	232	id: scatterSeries
	233	name: "scatter"
	234
	235	SignalSpy {
	236	id: scatterSeriesPointAddedSpy
	237	target: scatterSeries
	238	signalName: "pointAdded"
	239	}
	240
	241	SignalSpy {
	242	id: scatterSeriesPointReplacedSpy
	243	target: scatterSeries
	244	signalName: "pointReplaced"
	245	}
	246
	247	SignalSpy {
	248	id: scatterSeriesPointsReplacedSpy
	249	target: scatterSeries
	250	signalName: "pointsReplaced"
	251	}
	252
	253	SignalSpy {
	254	id: scatterSeriesPointRemovedSpy
	255	target: scatterSeries
	256	signalName: "pointRemoved"
	257	}
	258	}
	259	}
	260	}

src/charts/xychart/qxymodelmapper.cpp +19 0

@@ -94,6 +94,7 void QXYModelMapper::setSeries(QXYSeries *series)
94	connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));	94	connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));
95	connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));	95	connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));
96	connect(d->m_series, SIGNAL(destroyed()), d, SLOT(handleSeriesDestroyed()));	96	connect(d->m_series, SIGNAL(destroyed()), d, SLOT(handleSeriesDestroyed()));
		97	connect(d->m_series, SIGNAL(pointsRemoved(int,int)), d, SLOT(handlePointsRemoved(int,int)));
97	}	98	}
98		99
99	/*!	100	/*!
@@ -309,6 +310,24 void QXYModelMapperPrivate::handlePointRemoved(int pointPos)
309	blockModelSignals(false);	310	blockModelSignals(false);
310	}	311	}
311		312
		313	void QXYModelMapperPrivate::handlePointsRemoved(int pointPos, int count)
		314	{
		315	if (m_seriesSignalsBlock)
		316	return;
		317
		318	m_count -= count;
		319
		320	if (m_count < -1)
		321	m_count = -1;
		322
		323	blockModelSignals();
		324	if (m_orientation == Qt::Vertical)
		325	m_model->removeRows(pointPos + m_first, count);
		326	else
		327	m_model->removeColumns(pointPos + m_first, count);
		328	blockModelSignals(false);
		329	}
		330
312	void QXYModelMapperPrivate::handlePointReplaced(int pointPos)	331	void QXYModelMapperPrivate::handlePointReplaced(int pointPos)
313	{	332	{
314	if (m_seriesSignalsBlock)	333	if (m_seriesSignalsBlock)

src/charts/xychart/qxymodelmapper_p.h +1 0

                 // for the series
                 void handlePointAdded(int pointPos);
                 void handlePointRemoved(int pointPos);
+                void handlePointsRemoved(int pointPos, int count);
                 void handlePointReplaced(int pointPos);
                 void handleSeriesDestroyed();

src/charts/xychart/qxyseries.cpp +55 -15

                 \property QXYSeries::color
                 The color of the series. This is line (pen) color in case of QLineSeries or QSplineSeries and
                 fill (brush) color in case of QScatterSeries or QAreaSeries.
-                \sa QXYSeries::pen(), QXYSeries::brush()
+                \sa pen(), brush()
             */
             /*!
                 \qmlproperty color XYSeries::color
                 area, labels on the edge of the plot area are cut. If the points are close to each other the
                 labels may overlap.
-                \sa QXYSeries::pointLabelsVisible, QXYSeries::pointLabelsFont, QXYSeries::pointLabelsColor
+                \sa pointLabelsVisible, pointLabelsFont, pointLabelsColor
             */
             /*!
                 \qmlproperty string XYSeries::pointLabelsFormat
                 The \a format used for showing labels with series points.
-                \sa QXYSeries::pointLabelsFormat, pointLabelsVisible, pointLabelsFont, pointLabelsColor
+                \sa pointLabelsFormat, pointLabelsVisible, pointLabelsFont, pointLabelsColor
             */
             /*!
                 \fn void QXYSeries::pointLabelsFormatChanged(const QString &format)
                 \property QXYSeries::pointLabelsVisible
                 Defines the visibility for data point labels. False by default.
-                \sa QXYSeries::pointLabelsFormat
+                \sa pointLabelsFormat
             */
             /*!
                 \qmlproperty bool XYSeries::pointLabelsVisible
                 \property QXYSeries::pointLabelsFont
                 Defines the font used for data point labels.
-                \sa QXYSeries::pointLabelsFormat
+                \sa pointLabelsFormat
             */
             /*!
                 \qmlproperty font XYSeries::pointLabelsFont
                 Defines the color used for data point labels. By default, the color is the color of the brush
                 defined in theme for labels.
-                \sa QXYSeries::pointLabelsFormat
+                \sa pointLabelsFormat
             */
             /*!
                 \qmlproperty font XYSeries::pointLabelsColor
             */
             /*!
+                \fn void QXYSeries::pointsRemoved(int index, int count)
+                Signal is emitted when a \a count of points has been removed starting at \a index.
+                \sa removePoints(), clear()
+            */
+            /*!
+                \qmlsignal XYSeries::onPointsRemoved(int index, int count)
+                Signal is emitted when a \a count of points has been removed starting at \a index.
+            */
+            /*!
                 \fn void QXYSeries::colorChanged(QColor color)
                 \brief Signal is emitted when the line (pen) color has changed to \a color.
             */
             */
             /*!
+                \qmlmethod XYSeries::remove(int index)
+                Removes a point from the series at \a index.
+            */
+            /*!
+                \qmlmethod XYSeries::removePoints(int index, int count)
+                Removes \a count points from the series starting at \a index.
+            */
+            /*!
                 \qmlmethod XYSeries::insert(int index, real x, real y)
                 Inserts point (\a x, \a y) to the \a index. If index is 0 or smaller than 0 the point is prepended to the list of
                 points. If index is the same as or bigger than count, the point is appended to the list of points.
             /*!
               Replaces data point (\a oldX, \a oldY) with data point (\a newX, \a newY).
-              \sa QXYSeries::pointReplaced()
+              \sa pointReplaced()
             */
             void QXYSeries::replace(qreal oldX, qreal oldY, qreal newX, qreal newY)
             {
             /*!
               Replaces \a oldPoint with \a newPoint.
-              \sa QXYSeries::pointReplaced()
+              \sa pointReplaced()
             */
             void QXYSeries::replace(const QPointF &oldPoint, const QPointF &newPoint)
             {
             /*!
               Replaces the point at \a index with data point (\a newX, \a newY).
-              \sa QXYSeries::pointReplaced()
+              \sa pointReplaced()
             */
             void QXYSeries::replace(int index, qreal newX, qreal newY)
             {
             /*!
               Replaces the point at \a index with \a newPoint.
-              \sa QXYSeries::pointReplaced()
+              \sa pointReplaced()
             */
             void QXYSeries::replace(int index, const QPointF &newPoint)
             {
               or first clearing all data, and then appending the new data. Emits QXYSeries::pointsReplaced()
               when the points have been replaced. However, note that using the overload that takes
               \c{QVector<QPointF>} as parameter is slightly faster than using this overload.
-              \sa QXYSeries::pointsReplaced()
+              \sa pointsReplaced()
             */
             void QXYSeries::replace(QList<QPointF> points)
             {
               \note This is much faster than replacing data points one by one,
               or first clearing all data, and then appending the new data. Emits QXYSeries::pointsReplaced()
               when the points have been replaced.
-              \sa QXYSeries::pointsReplaced()
+              \sa pointsReplaced()
             */
             void QXYSeries::replace(QVector<QPointF> points)
             {
             /*!
               Removes the point (\a x, \a y) from the series.
+              \sa pointRemoved()
             */
             void QXYSeries::remove(qreal x, qreal y)
             {
             /*!
               Removes the \a point from the series.
+              \sa pointRemoved()
             */
             void QXYSeries::remove(const QPointF &point)
             {
             /*!
               Removes the point at \a index from the series.
+              \sa pointRemoved()
             */
             void QXYSeries::remove(int index)
             {
             }
             /*!
+              Removes \a count number of points from the series starting at \a index.
+              \sa pointsRemoved()
+            */
+            void QXYSeries::removePoints(int index, int count)
+            {
+                // This function doesn't overload remove as there is chance for it to get mixed up with
+                // remove(qreal, qreal) overload in some implicit casting cases.
+                Q_D(QXYSeries);
+                if (count > 0) {
+                    d->m_points.remove(index, count);
+                    emit pointsRemoved(index, count);
+                }
+            }
+            /*!
                Inserts a \a point in the series at \a index position.
+              \sa pointAdded()
             */
             void QXYSeries::insert(int index, const QPointF &point)
             {
             }
             /*!
-                Removes all points from the series.
+              Removes all points from the series.
+              \sa pointsRemoved()
             */
             void QXYSeries::clear()
             {
                 Q_D(QXYSeries);
-                for (int i = d->m_points.size() - 1; i >= 0; i--)
+                removePoints(0, d->m_points.size());
-                    remove(d->m_points.at(i));
             }
             /*!

src/charts/xychart/qxyseries.h +2 0

                 void remove(qreal x, qreal y);
                 void remove(const QPointF &point);
                 void remove(int index);
+                void removePoints(int index, int count);
                 void insert(int index, const QPointF &point);
                 void clear();
                 void pointLabelsVisibilityChanged(bool visible);
                 void pointLabelsFontChanged(const QFont &font);
                 void pointLabelsColorChanged(const QColor &color);
+                void pointsRemoved(int index, int count);
             private:
                 Q_DECLARE_PRIVATE(QXYSeries)

src/charts/xychart/xychart.cpp +18 0

@@ -39,6 +39,7 XYChart::XYChart(QXYSeries series, QGraphicsItem item):
39	QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced()));	39	QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced()));
40	QObject::connect(series, SIGNAL(pointAdded(int)), this, SLOT(handlePointAdded(int)));	40	QObject::connect(series, SIGNAL(pointAdded(int)), this, SLOT(handlePointAdded(int)));
41	QObject::connect(series, SIGNAL(pointRemoved(int)), this, SLOT(handlePointRemoved(int)));	41	QObject::connect(series, SIGNAL(pointRemoved(int)), this, SLOT(handlePointRemoved(int)));
		42	QObject::connect(series, SIGNAL(pointsRemoved(int, int)), this, SLOT(handlePointsRemoved(int, int)));
42	QObject::connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));	43	QObject::connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));
43	QObject::connect(this, SIGNAL(hovered(QPointF,bool)), series, SIGNAL(hovered(QPointF,bool)));	44	QObject::connect(this, SIGNAL(hovered(QPointF,bool)), series, SIGNAL(hovered(QPointF,bool)));
44	QObject::connect(this, SIGNAL(pressed(QPointF)), series, SIGNAL(pressed(QPointF)));	45	QObject::connect(this, SIGNAL(pressed(QPointF)), series, SIGNAL(pressed(QPointF)));
@@ -145,6 +146,23 void XYChart::handlePointRemoved(int index)
145	updateChart(m_points, points, index);	146	updateChart(m_points, points, index);
146	}	147	}
147		148
		149	void XYChart::handlePointsRemoved(int index, int count)
		150	{
		151	Q_ASSERT(index <= m_series->count());
		152	Q_ASSERT(index >= 0);
		153
		154	QVector<QPointF> points;
		155
		156	if (m_dirty \|\| m_points.isEmpty()) {
		157	points = domain()->calculateGeometryPoints(m_series->points());
		158	} else {
		159	points = m_points;
		160	points.remove(index, count);
		161	}
		162
		163	updateChart(m_points, points, index);
		164	}
		165
148	void XYChart::handlePointReplaced(int index)	166	void XYChart::handlePointReplaced(int index)
149	{	167	{
150	Q_ASSERT(index < m_series->count());	168	Q_ASSERT(index < m_series->count());

src/charts/xychart/xychart_p.h +1 0

             public Q_SLOTS:
                 void handlePointAdded(int index);
                 void handlePointRemoved(int index);
+                void handlePointsRemoved(int index, int count);
                 void handlePointReplaced(int index);
                 void handlePointsReplaced();
                 void handleDomainUpdated();

src/chartsqml2/chartsqml2_plugin.cpp +3 0

                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 2, 1, "AbstractAxis",
                                                               QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                     qmlRegisterType<DeclarativeChart, 5>(uri, 2, 1, "ChartView");
+                    qmlRegisterType<DeclarativeScatterSeries, 5>(uri, 2, 1, "ScatterSeries");
+                    qmlRegisterType<DeclarativeLineSeries, 4>(uri, 2, 1, "LineSeries");
+                    qmlRegisterType<DeclarativeSplineSeries, 4>(uri, 2, 1, "SplineSeries");
                 }
             };

src/chartsqml2/declarativelineseries.cpp +1 0

                 connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
                 connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
+                connect(this, SIGNAL(pointsRemoved(int, int)), this, SLOT(handleCountChanged(int)));
             }
             void DeclarativeLineSeries::handleCountChanged(int index)

src/chartsqml2/declarativelineseries.h +1 0

                 Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
+                Q_REVISION(4) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }

src/chartsqml2/declarativescatterseries.cpp +1 0

                 connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
                 connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
+                connect(this, SIGNAL(pointsRemoved(int, int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
             }

src/chartsqml2/declarativescatterseries.h +1 0

                 Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
+                Q_REVISION(5) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }

src/chartsqml2/declarativesplineseries.cpp +1 0

                 connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
                 connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
+                connect(this, SIGNAL(pointsRemoved(int, int)), this, SLOT(handleCountChanged(int)));
             }
             void DeclarativeSplineSeries::handleCountChanged(int index)

src/chartsqml2/declarativesplineseries.h +1 0

                 Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
+                Q_REVISION(4) Q_INVOKABLE void removePoints(int index, int count) { DeclarativeXySeries::removePoints(index, count); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }

src/chartsqml2/declarativexyseries.cpp +7 0

                 series->remove(index);
             }
+            void DeclarativeXySeries::removePoints(int index, int count)
+            {
+                QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
+                Q_ASSERT(series);
+                series->removePoints(index, count);
+            }
             void DeclarativeXySeries::insert(int index, qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

src/chartsqml2/declarativexyseries.h +1 0

                 void replace(int index, qreal newX, qreal newY);
                 void remove(qreal x, qreal y);
                 void remove(int index);
+                void removePoints(int index, int count);
                 void insert(int index, qreal x, qreal y);
                 void clear();
                 QPointF at(int index);

tests/auto/qml-qtquicktest/tst_xyseries.qml +49 -1

@@ -18,7 +18,7
18		18
19	import QtQuick 2.0	19	import QtQuick 2.0
20	import QtTest 1.0	20	import QtTest 1.0
21	import QtCharts 2.0	21	import QtCharts 2.1
22		22
23	Rectangle {	23	Rectangle {
24	width: 400	24	width: 400
@@ -133,6 +133,36 Rectangle {
133	compare(lineSeriesPointRemovedSpy.count, count);	133	compare(lineSeriesPointRemovedSpy.count, count);
134	compare(splineSeriesPointRemovedSpy.count, count);	134	compare(splineSeriesPointRemovedSpy.count, count);
135	compare(scatterSeriesPointRemovedSpy.count, count);	135	compare(scatterSeriesPointRemovedSpy.count, count);
		136
		137	lineSeriesPointRemovedSpy.clear();
		138	splineSeriesPointRemovedSpy.clear();
		139	scatterSeriesPointRemovedSpy.clear();
		140	lineSeriesPointsRemovedSpy.clear();
		141	splineSeriesPointsRemovedSpy.clear();
		142	scatterSeriesPointsRemovedSpy.clear();
		143
		144	count = append();
		145	lineSeries.removePoints(2, count - 2);
		146	splineSeries.removePoints(2, count - 2);
		147	scatterSeries.removePoints(2, count - 2);
		148
		149	compare(lineSeries.count, 2);
		150	compare(splineSeries.count, 2);
		151	compare(scatterSeries.count, 2);
		152
		153	lineSeries.removePoints(0, 2);
		154	splineSeries.removePoints(0, 2);
		155	scatterSeries.removePoints(0, 2);
		156
		157	compare(lineSeries.count, 0);
		158	compare(splineSeries.count, 0);
		159	compare(scatterSeries.count, 0);
		160	compare(lineSeriesPointRemovedSpy.count, 0);
		161	compare(splineSeriesPointRemovedSpy.count, 0);
		162	compare(scatterSeriesPointRemovedSpy.count, 0);
		163	compare(lineSeriesPointsRemovedSpy.count, 2);
		164	compare(splineSeriesPointsRemovedSpy.count, 2);
		165	compare(scatterSeriesPointsRemovedSpy.count, 2);
136	}	166	}
137		167
138	// Not a test function, called from test functions	168	// Not a test function, called from test functions
@@ -191,6 +221,12 Rectangle {
191	target: lineSeries	221	target: lineSeries
192	signalName: "pointRemoved"	222	signalName: "pointRemoved"
193	}	223	}
		224
		225	SignalSpy {
		226	id: lineSeriesPointsRemovedSpy
		227	target: lineSeries
		228	signalName: "pointsRemoved"
		229	}
194	}	230	}
195		231
196	AreaSeries {	232	AreaSeries {
@@ -226,6 +262,12 Rectangle {
226	target: splineSeries	262	target: splineSeries
227	signalName: "pointRemoved"	263	signalName: "pointRemoved"
228	}	264	}
		265
		266	SignalSpy {
		267	id: splineSeriesPointsRemovedSpy
		268	target: splineSeries
		269	signalName: "pointsRemoved"
		270	}
229	}	271	}
230		272
231	ScatterSeries {	273	ScatterSeries {
@@ -255,6 +297,12 Rectangle {
255	target: scatterSeries	297	target: scatterSeries
256	signalName: "pointRemoved"	298	signalName: "pointRemoved"
257	}	299	}
		300
		301	SignalSpy {
		302	id: scatterSeriesPointsRemovedSpy
		303	target: scatterSeries
		304	signalName: "pointsRemoved"
		305	}
258	}	306	}
259	}	307	}
260	}	308	}

tests/auto/qml/tst_qml.cpp +4 -1

                 QTest::newRow("BoxPlotSeries_2_0") <<  imports_2_0() + "BoxPlotSeries{}";
                 QTest::newRow("BoxSet_2_0") <<  imports_2_0() + "BoxSet{}";
-                QTest::newRow("CategoryAxis") << imports_2_1() + "CategoryAxis{}";
+                QTest::newRow("CategoryAxis_2_1") << imports_2_1() + "CategoryAxis{}";
+                QTest::newRow("ScatterSeries_2_1") << imports_2_1() + "ScatterSeries{}";
+                QTest::newRow("LineSeries_2_1") << imports_2_1() + "LineSeries{}";
+                QTest::newRow("SplineSeries_2_1") << imports_2_1() + "SplineSeries{}";
             }
             void tst_qml::checkPlugin()

tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +4 0

                 QCOMPARE(m_series->count(), m_modelRowCount);
                 QCOMPARE(m_vMapper->rowCount(), -1); // the value should not change as it indicates 'all' items there are in the model
+                m_series->removePoints(1, m_modelRowCount - 4);
+                QCOMPARE(m_series->count(), 4);
+                QCOMPARE(m_vMapper->rowCount(), -1); // the value should not change as it indicates 'all' items there are in the model
                 m_series->replace(m_series->points().first(), QPointF(25.0, 75.0));
                 QCOMPARE(m_model->data(m_model->index(0, 0)).toReal(), 25.0);
                 QCOMPARE(m_model->data(m_model->index(0, 1)).toReal(), 75.0);

tests/auto/qxyseries/tst_qxyseries.cpp +10 0

@@ -316,6 +316,16 void tst_QXYSeries::remove_raw()
316	QCOMPARE(m_series->points().count(), i);	316	QCOMPARE(m_series->points().count(), i);
317	}	317	}
318	QCOMPARE(m_series->points().count(), 0);	318	QCOMPARE(m_series->points().count(), 0);
		319
		320	// Multiple removal using index
		321	for (int i = 0; i < 10; i++)
		322	bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX));
		323	m_series->replace(bunchOfPoints);
		324	m_series->removePoints(5, 2);
		325	m_series->removePoints(0, 3);
		326	QCOMPARE(m_series->points().count(), (bunchOfPoints.count() - 5));
		327	m_series->removePoints(0, (bunchOfPoints.count() - 5));
		328	QCOMPARE(m_series->points().count(), 0);
319	}	329	}
320		330
321	void tst_QXYSeries::remove_chart_data()	331	void tst_QXYSeries::remove_chart_data()

tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +10 0

@@ -111,6 +111,16 Flow {
111	onClicked: series.remove(series.count - 1);	111	onClicked: series.remove(series.count - 1);
112	}	112	}
113	Button {	113	Button {
		114	text: "remove points"
		115	onClicked: {
		116	var count = 3;
		117	if (series.count < 3)
		118	count = series.count
		119	var index = series.count - count;
		120	series.removePoints(index, count);
		121	}
		122	}
		123	Button {
114	text: "insert point"	124	text: "insert point"
115	onClicked: series.insert(series.count - 2, series.count - 2, series.count - 2);	125	onClicked: series.insert(series.count - 2, series.count - 2, series.count - 2);
116	}	126	}

tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +10 0

@@ -106,6 +106,16 Flow {
106	onClicked: series.remove(series.count - 1);	106	onClicked: series.remove(series.count - 1);
107	}	107	}
108	Button {	108	Button {
		109	text: "remove points"
		110	onClicked: {
		111	var count = 3;
		112	if (series.count < 3)
		113	count = series.count
		114	var index = series.count - count;
		115	series.removePoints(index, count);
		116	}
		117	}
		118	Button {
109	text: "insert point"	119	text: "insert point"
110	onClicked: series.insert(series.count - 2, series.count - 2, series.count - 2);	120	onClicked: series.insert(series.count - 2, series.count - 2, series.count - 2);
111	}	121	}

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