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

              ChartView {
                  id: chartView
                  animationOptions: ChartView.NoAnimation
+                 theme: ChartView.ChartThemeDark
                  ValueAxis {
                      id: axisY1
                  }
                  //![2]
+                 //![3]
                  function changeSeriesType(type) {
-                     chartView.series(1).destroy();
-                     chartView.series(0).destroy();
-                     var seriesCount = 2;
-                     for (var i = 0; i < seriesCount; i++) {
-                         var series;
-                         if (type == "line") {
-                             series = scopeView.createSeries(ChartView.SeriesTypeLine, "signal " + (i + 1));
-                         } else if (type == "spline") {
-                             series = chartView.createSeries(ChartView.SeriesTypeSpline, "signal " + (i + 1));
-                         } else {
-                             series = chartView.createSeries(ChartView.SeriesTypeScatter, "signal " + (i + 1));
-                             series.markerSize = 3;
-                             series.borderColor = "transparent";
+                         }
+                     chartView.removeAllSeries();
+                     // Create two new series of the correct type. Axis x is the same for both of the series,
+                     // but the series have their own y-axes to make it possible to control the y-offset
+                     // of the "signal sources".
+                     if (type == "line") {
+                         scopeView.createSeries(ChartView.SeriesTypeLine, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
+                         scopeView.createSeries(ChartView.SeriesTypeLine, "signal 2", chartView.axisX(), createAxis(-10, 5));
+                     } else if (type == "spline") {
+                         scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
+                         scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 2", chartView.axisX(), createAxis(-10, 5));
+                     } else {
+                         var series1 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
+                         series1.markerSize = 3;
+                         series1.borderColor = "transparent";
+                         var series2 = scopeView.createSeries(ChartView.SeriesTypeScatter, "signal 2", chartView.axisX(), createAxis(-10, 5));
+                         series2.markerSize = 3;
+                         series2.borderColor = "transparent";
                      }
                  }
+                 function createAxis(min, max) {
+                     // The following creates a ValueAxis object that can be then set as a x or y axis for a series
+                     return Qt.createQmlObject("import QtQuick 1.1; import QtCommercial.Chart 1.1; ValueAxis { min: "
+                                               + min + "; max: " + max + " }", chartView);
+                 }
+                 //![3]
                  function setAnimations(enabled) {
                      if (enabled)
                          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)
-               Creates a series object of \a type to the chart. For example:
+               \qmlmethod AbstractSeries ChartView::createSeries(SeriesType type, string name, AbstractAxis axisX, AbstractAxis axisY)
+               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");
-                 scatter.markerSize = 22;
-                 scatter.append(1.1, 2.0);
+                 // lineSeries is a LineSeries object that has already been added to the ChartView; re-use it's axes
+                 var myAxisX = chartView.axisX(lineSeries);
+                 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