HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1960:bd364d589414

QML: Added possibility to define axes when creating series

Tero Ahola -

r1960:bd364d589414

parent child

Context file:

r1960:bd364d589414

Collapse all files

demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml +27 -14

@@ -25,6 +25,7 import QtCommercial.Chart 1.1
25	ChartView {	25	ChartView {
26	id: chartView	26	id: chartView
27	animationOptions: ChartView.NoAnimation	27	animationOptions: ChartView.NoAnimation
		28	theme: ChartView.ChartThemeDark
28		29
29	ValueAxis {	30	ValueAxis {
30	id: axisY1	31	id: axisY1
@@ -72,24 +73,36 ChartView {
72	}	73	}
73	//![2]	74	//![2]
74		75
		76	//![3]
75	function changeSeriesType(type) {	77	function changeSeriesType(type) {
76	chartView.~~series~~(1).~~destroy~~();	78	chartView.removeAllSeries();
77	chartView.series(0).destroy();	79
78	var seriesCount = 2;	80	// Create two new series of the correct type. Axis x is the same for both of the series,
79	for (var i = 0; i < seriesCount; i++) {	81	// but the series have their own y-axes to make it possible to control the y-offset
80	var series;	82	// of the "signal sources".
81	if (type == "line") {	83	if (type == "line") {
82	~~series~~ = scopeView.createSeries(ChartView.SeriesTypeLine, "signal " + (i + 1));	84	scopeView.createSeries(ChartView.SeriesTypeLine, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
83	} else if (type == "spline") {	85	scopeView.createSeries(ChartView.SeriesTypeLine, "signal 2", chartView.axisX(), createAxis(-10, 5));
84	series = chartView.createSeries(ChartView.SeriesTypeSpline, "signal " + (i + 1));	86	} else if (type == "spline") {
85	} else {	87	scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
86	~~series~~ = ~~chart~~View.createSeries(ChartView.SeriesTypeS~~catter~~, "signal " + (i + 1));	88	scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 2", chartView.axisX(), createAxis(-10, 5));
87	series.markerSize = 3;	89	} else {
88	series.borderColor = "transparent";	90	var series1 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
89	}	91	series1.markerSize = 3;
		92	series1.borderColor = "transparent";
		93	var series2 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 2", chartView.axisX(), createAxis(-10, 5));
		94	series2.markerSize = 3;
		95	series2.borderColor = "transparent";
90	}	96	}
91	}	97	}
92		98
		99	function createAxis(min, max) {
		100	// The following creates a ValueAxis object that can be then set as a x or y axis for a series
		101	return Qt.createQmlObject("import QtQuick 1.1; import QtCommercial.Chart 1.1; ValueAxis { min: "
		102	+ min + "; max: " + max + " }", chartView);
		103	}
		104	//![3]
		105
93	function setAnimations(enabled) {	106	function setAnimations(enabled) {
94	if (enabled)	107	if (enabled)
95	scopeView.animationOptions = ChartView.SeriesAnimations;	108	scopeView.animationOptions = ChartView.SeriesAnimations;

doc/images/demos_qmloscilloscope.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

doc/src/demos-qmloscilloscope.qdoc +4 0

                 The data of the line series is updated with a QML timer. In a real life application the
                 updating could triggered with a signal from Qt C++ code.
                 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml 2
+                The oscilloscope also allows you to switch the type of the series used for visualizing the
+                signal sources. This is implemented by dynamically destroying and creating series:
+                \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml 3
             */

plugins/declarative/declarativechart.cpp +22 -6

             */
             /*!
-              \qmlmethod AbstractSeries ChartView::createSeries(SeriesType type, string name)
+              \qmlmethod AbstractSeries ChartView::createSeries(SeriesType type, string name, AbstractAxis axisX, AbstractAxis axisY)
-              Creates a series object of \a type to the chart. For example:
+              Creates a series object of \a type to the chart with name \a name, optional axis \a axisX and
+              optional axis \a axisY. For example:
               \code
-                var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter series");
+                // lineSeries is a LineSeries object that has already been added to the ChartView; re-use it's axes
-                scatter.markerSize = 22;
+                var myAxisX = chartView.axisX(lineSeries);
-                scatter.append(1.1, 2.0);
+                var myAxisY = chartView.axisY(lineSeries);
+                var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter series", myAxisX, myAxisY);
               \endcode
             */
             */
             /*!
+              \qmlmethod Axis ChartView::axisX(QAbstractSeries *series)
+              The x-axis of the series.
+            */
+            /*!
               \qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
-              The y-axis of the series. This is the same as the default y-axis of the chart as multiple y-axes are not yet supported.
+              The y-axis of the series.
             */
             /*!
             QAbstractSeries *DeclarativeChart::createSeries(DeclarativeChart::SeriesType type, QString name)
             {
+                return createSeries(type, name, 0, 0);
+            }
+            QAbstractSeries *DeclarativeChart::createSeries(DeclarativeChart::SeriesType type, QString name, QAbstractAxis *axisX, QAbstractAxis *axisY)
+            {
                 QAbstractSeries *series = 0;
                 switch (type) {
                 if (series) {
                     series->setName(name);
                     m_chart->addSeries(series);
+                    // Set possible user defined axes
+                    setAxisX(axisX, series);
+                    setAxisY(axisY, series);
+                    // Then create the missing axes
                     createDefaultAxes(series);
                 }

plugins/declarative/declarativechart.h +1 0

                 Q_INVOKABLE QAbstractSeries *series(int index);
                 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
+                Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name, QAbstractAxis *axisX, QAbstractAxis *axisY);
                 Q_INVOKABLE void removeSeries(QAbstractSeries *series) { m_chart->removeSeries(series); }
                 Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); }
                 Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);

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