HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1505:d43045438e43

QML xy-series data manipulation

Tero Ahola -

r1505:d43045438e43

parent child

Context file:

r1505:d43045438e43

plugins/declarative/declarativelineseries.h +2 0

             public: // from QLineSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QLineSeries::append(x, y); }
+                Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { QLineSeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QLineSeries::remove(x, y); }
+                Q_INVOKABLE void insert(int index, qreal x, qreal y) { QLineSeries::insert(index, QPointF(x, y)); }
                 Q_INVOKABLE void clear() { QLineSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }

plugins/declarative/declarativescatterseries.h +2 0

             public: // from QScatterSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QScatterSeries::append(x, y); }
+                Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { QScatterSeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QScatterSeries::remove(x, y); }
                 Q_INVOKABLE void clear() { QScatterSeries::clear(); }
+                Q_INVOKABLE void insert(int index, qreal x, qreal y) { QScatterSeries::insert(index, QPointF(x, y)); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
             Q_SIGNALS:

plugins/declarative/declarativesplineseries.h +3 0

             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
+                Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public: // from QSplineSeries
                 Q_INVOKABLE void append(qreal x, qreal y) { QSplineSeries::append(x, y); }
+                Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { QSplineSeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { QSplineSeries::remove(x, y); }
                 Q_INVOKABLE void clear() { QSplineSeries::clear(); }
+                Q_INVOKABLE void insert(int index, qreal x, qreal y) { QSplineSeries::insert(index, QPointF(x, y)); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
             Q_SIGNALS:

tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +1 -1

                     onClicked:                  console.log("lineSeries.onClicked: " + point.x + ", " + point.y);
                     onPointReplaced:            console.log("lineSeries.onPointReplaced: " + index);
                     onPointRemoved:             console.log("lineSeries.onPointRemoved: " + index);
-                    onPointAdded:               console.log("lineSeries.onPointAdded: " + index);
+                    onPointAdded:               console.log("lineSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("lineSeries.onColorChanged: " + color);
                     onCountChanged:             console.log("lineSeries.onCountChanged: " + count);
                 }

tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +24 -1

@@ -38,6 +38,29 Flow {
38	}	38	}
39	Button {	39	Button {
40	text: "points visible"	40	text: "points visible"
41	onClicked: series.pointsVisible = !series.pointsVisible	41	onClicked: series.pointsVisible = !series.pointsVisible;
		42	}
		43	Button {
		44	text: "append point"
		45	onClicked: series.append(series.count - 1, series.count - 1);
		46	}
		47	Button {
		48	text: "replace point"
		49	onClicked: {
		50	var xyPoint = series.at(series.count - 1);
		51	series.replace(xyPoint.x, xyPoint.y, xyPoint.x, xyPoint.y + 0.1);
		52	}
		53	}
		54	Button {
		55	text: "remove point"
		56	onClicked: series.remove(series.at(series.count - 1).x, series.at(series.count - 1).y);
		57	}
		58	Button {
		59	text: "insert point"
		60	onClicked: series.insert(0, series.count - 1, series.count - 1);
		61	}
		62	Button {
		63	text: "clear"
		64	onClicked: series.clear();
42	}	65	}
43	}	66	}

tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +3 0

                     onNameChanged:              console.log("scatterSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("scatterSeries.onVisibleChanged: " + visible);
+                    onPointReplaced:            console.log("scatterSeries.onPointReplaced: " + index);
+                    onPointRemoved:             console.log("scatterSeries.onPointRemoved: " + index);
+                    onPointAdded:               console.log("scatterSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("scatterSeries.onColorChanged: " + color);
                     onBorderColorChanged:       console.log("scatterSeries.onBorderColorChanged: " + borderColor);
                     onCountChanged:             console.log("scatterSeries.onCountChanged: " + count);

tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +23 0

@@ -52,4 +52,27 Flow {
52	text: "markerShape"	52	text: "markerShape"
53	onClicked: series.markerShape = ((series.markerShape + 1) % 2);	53	onClicked: series.markerShape = ((series.markerShape + 1) % 2);
54	}	54	}
		55	Button {
		56	text: "append point"
		57	onClicked: series.append(series.count - 1, series.count - 1);
		58	}
		59	Button {
		60	text: "replace point"
		61	onClicked: {
		62	var xyPoint = series.at(series.count - 1);
		63	series.replace(xyPoint.x, xyPoint.y, xyPoint.x, xyPoint.y + 0.1);
		64	}
		65	}
		66	Button {
		67	text: "remove point"
		68	onClicked: series.remove(series.at(series.count - 1).x, series.at(series.count - 1).y);
		69	}
		70	Button {
		71	text: "insert point"
		72	onClicked: series.insert(0, series.count - 1, series.count - 1);
		73	}
		74	Button {
		75	text: "clear"
		76	onClicked: series.clear();
		77	}
55	}	78	}

tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +1 -1

                     onClicked:                  console.log("splineSeries.onClicked: " + point.x + ", " + point.y);
                     onPointReplaced:            console.log("splineSeries.onPointReplaced: " + index);
                     onPointRemoved:             console.log("splineSeries.onPointRemoved: " + index);
-                    onPointAdded:               console.log("splineSeries.onPointAdded: " + index);
+                    onPointAdded:               console.log("splineSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("splineSeries.onColorChanged: " + color);
                     onCountChanged:             console.log("splineSeries.onCountChanged: " + count);
                 }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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