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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.1
             //![1]
             ChartView {
                 id: chartView
                 animationOptions: ChartView.NoAnimation
+                theme: ChartView.ChartThemeDark
                 ValueAxis {
                     id: axisY1
                     min: -1
                     max: 4
                 }
                 ValueAxis {
                     id: axisY2
                     min: -10
                     max: 5
                 }
                 ValueAxis {
                     id: axisX
                     min: 0
                     max: 1000
                 }
                 LineSeries {
                     id: lineSeries1
                     name: "signal 1"
                     axisX: axisX
                     axisY: axisY1
                 }
                 LineSeries {
                     id: lineSeries2
                     name: "signal 2"
                     axisX: axisX
                     axisY: axisY2
                 }
             // ...
             //![1]
                 //![2]
                 Timer {
                     id: refreshTimer
                     interval: 1 / 60 * 1000 // 60 Hz
                     running: true
                     repeat: true
                     onTriggered: {
                         dataSource.update(chartView.series(0));
                         dataSource.update(chartView.series(1));
                     }
                 }
                 //![2]
+                //![3]
                 function changeSeriesType(type) {
-                    chartView.series(1).destroy();
+                    chartView.removeAllSeries();
-                    chartView.series(0).destroy();
-                    var seriesCount = 2;
+                    // Create two new series of the correct type. Axis x is the same for both of the series,
-                    for (var i = 0; i < seriesCount; i++) {
+                    // but the series have their own y-axes to make it possible to control the y-offset
-                        var series;
+                    // of the "signal sources".
-                        if (type == "line") {
+                    if (type == "line") {
-                            series = scopeView.createSeries(ChartView.SeriesTypeLine, "signal " + (i + 1));
+                        scopeView.createSeries(ChartView.SeriesTypeLine, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
-                        } else if (type == "spline") {
+                        scopeView.createSeries(ChartView.SeriesTypeLine, "signal 2", chartView.axisX(), createAxis(-10, 5));
-                            series = chartView.createSeries(ChartView.SeriesTypeSpline, "signal " + (i + 1));
+                    } else if (type == "spline") {
-                        } else {
+                        scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 1", createAxis(0, 1000), createAxis(-1, 4));
-                            series = chartView.createSeries(ChartView.SeriesTypeScatter, "signal " + (i + 1));
+                        scopeView.createSeries(ChartView.SeriesTypeSpline, "signal 2", chartView.axisX(), createAxis(-10, 5));
-                            series.markerSize = 3;
+                    } else {
-                            series.borderColor = "transparent";
+                        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;
                     else
                         scopeView.animationOptions = ChartView.NoAnimation;
                 }
                 function changeRefreshRate(rate) {
                     refreshTimer.interval = 1 / Number(rate) * 1000;
                 }
             }

doc/images/demos_qmloscilloscope.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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

             /*!
                 \example demos/qmloscilloscope
                 \title Oscilloscope
                 \image demos_qmloscilloscope.png
                 Oscilloscope application demonstrates how to use QtCommercial Charts QML api to implement an
                 application with strict performance requirements. The application uses generated data with
                 configurable characteristics to mimic a simple oscilloscope user interface. To find out the
                 actual screen refresh performance of the application, you can set QML_SHOW_FRAMERATE = 1 to
                 your run environment settings to get the framerate shown in the application output console.
                 I.e. go to Projects - Run - Run environment in Qt Creator and select Add. Then you can
                 experiment with the different configurable options of the demo application to find the
                 configuration that gives you the best performance in your environment.
                 The application window is shared by control and scope views:
                 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/main.qml 1
                 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/main.qml 2
                 ControlView implements the buttons used for configuring. ScopeView uses a ChartView to show
                 a chart with two line series:
                 \snippet ../demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml 1
                 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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativechart.h"
             #include <QPainter>
             #include <QDeclarativeEngine>
             #include "declarativelineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include "declarativesplineseries.h"
             #include "declarativescatterseries.h"
             #include "qbarcategoryaxis.h"
             #include "qvalueaxis.h"
             #include "qcategoryaxis.h"
             #include "qabstractseries_p.h"
             #include "declarativemargins.h"
             #ifndef QT_ON_ARM
                 #include "qdatetimeaxis.h"
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \qmlclass ChartView DeclarativeChart
                 ChartView element is the parent that is responsible for showing different chart series types.
                 The following QML shows how to create a simple chart with one pie series:
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
                 \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
                 \beginfloatleft
                 \image examples_qmlpiechart.png
                 \endfloat
                 \clearfloat
             */
             /*!
               \qmlproperty Theme ChartView::theme
               Theme defines the visual appearance of the chart, including for example colors, fonts, line
               widths and chart background.
             */
             /*!
               \qmlproperty Animation ChartView::animation
               Animation configuration of the chart. One of ChartView.NoAnimation, ChartView.GridAxisAnimations,
               ChartView.SeriesAnimations or ChartView.AllAnimations.
             */
             /*!
               \qmlproperty Font ChartView::titleFont
               The title font of the chart
               See the \l {Font} {QML Font Element} for detailed documentation.
             */
             /*!
               \qmlproperty string ChartView::title
               The title of the chart, shown on top of the chart.
               \sa ChartView::titleColor
             */
             /*!
               \qmlproperty string ChartView::titleColor
               The color of the title text.
             */
             /*!
               \qmlproperty Axis ChartView::axisX
               The x-axis of the chart.
             */
             /*!
               \qmlproperty Axis ChartView::axisY
               The default y-axis of the chart.
             */
             /*!
               \qmlproperty Legend ChartView::legend
               The legend of the chart. Legend lists all the series, pie slices and bar sets added on the chart.
             */
             /*!
               \qmlproperty int ChartView::count
               The count of series added to the chart.
             */
             /*!
               \qmlproperty color ChartView::backgroundColor
               The color of the chart's background. By default background color is defined by chart theme.
               \sa ChartView::theme
             */
             /*!
               \qmlproperty bool ChartView::dropShadowEnabled
               The chart's border drop shadow. Set to true to enable drop shadow.
             */
             /*!
               \qmlproperty real ChartView::topMargin
               Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty real ChartView::bottomMargin
               Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty real ChartView::leftMargin
               Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty real ChartView::rightMargin
               Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty Margins ChartView::minimumMargins
               The minimum margins allowed between the outer bounds and the plotArea of the ChartView. Margins
               area of ChartView is used for drawing title, axes and legend. Please note that setting the
               properties of minimumMargins may be bigger than the defined value, depending on other ChartView
               properties that affect it's layout. If you need to know the actual plotting area used at any
               given time, you can check ChartView::plotArea instead.
             */
             /*!
               \qmlproperty rect ChartView::plotArea
               The area on the ChartView that is used for drawing series. This is the ChartView rect without the
               margins.
               \sa ChartView::minimumMargins
             */
             /*!
               \qmlmethod AbstractSeries ChartView::series(int index)
               Returns the series with \a index on the chart. This allows you to loop through the series of a chart together with
               the count property of the chart.
             */
             /*!
               \qmlmethod AbstractSeries ChartView::series(string name)
               Returns the first series on the chart with \a name. If there is no series with that name, returns null.
             */
             /*!
-              \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 ChartView::removeSeries(AbstractSeries series)
               Removes the \a series from the chart. The series object is also destroyed.
             */
             /*!
               \qmlmethod ChartView::removeAllSeries()
               Removes all series from the chart. All the series objects are also destroyed.
             */
             /*!
+              \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.
             */
             /*!
               \qmlmethod ChartView::zoomY(real factor)
               Zooms in by \a factor on the center of the chart.
             */
             /*!
               \qmlmethod ChartView::scrollLeft(real pixels)
               Scrolls to left by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
             */
             /*!
               \qmlmethod ChartView::scrollRight(real pixels)
               Scrolls to right by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
             */
             /*!
               \qmlmethod ChartView::scrollUp(real pixels)
               Scrolls up by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
             */
             /*!
               \qmlmethod ChartView::scrollDown(real pixels)
               Scrolls down by \a pixels. This is a convenience function that suits for example for key navigation.
               \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max
             */
             /*!
               \qmlsignal ChartView::onPlotAreaChanged(rect plotArea)
               The plot area of the chart has changed. This may happen for example, if you modify minimumMargins
               or if you resize the chart, or if you modify font size related properties of the legend or chart
               title.
             */
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this))
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
                 m_minMargins = new DeclarativeMargins(this);
                 connect(m_minMargins, SIGNAL(topChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
                 connect(m_minMargins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
                 connect(m_minMargins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
                 connect(m_minMargins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
             }
             void DeclarativeChart::changeMinimumMargins(int top, int bottom, int left, int right)
             {
                 m_chart->setMinimumMargins(QMargins(left, top, right, bottom));
                 emit minimumMarginsChanged();
                 emit plotAreaChanged(m_chart->plotArea());
             }
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
             }
             void DeclarativeChart::childEvent(QChildEvent *event)
             {
                 if (event->type() == QEvent::ChildAdded) {
                     if (qobject_cast<QAbstractSeries *>(event->child())) {
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(event->child()));
                     }
                 }
             }
             void DeclarativeChart::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<QAbstractSeries *>(child)) {
                         // Add series to the chart
                         QAbstractSeries *series = qobject_cast<QAbstractSeries *>(child);
                         m_chart->addSeries(series);
                         // Set optional user defined axes for the series and connect axis related signals
                         if (qobject_cast<DeclarativeLineSeries *>(child)) {
                             DeclarativeLineSeries *s = qobject_cast<DeclarativeLineSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeSplineSeries *>(child)) {
                             DeclarativeSplineSeries *s = qobject_cast<DeclarativeSplineSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeScatterSeries *>(child)) {
                             DeclarativeScatterSeries *s = qobject_cast<DeclarativeScatterSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeAreaSeries *>(child)) {
                             DeclarativeAreaSeries *s = qobject_cast<DeclarativeAreaSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeBarSeries *>(child)) {
                             DeclarativeBarSeries *s = qobject_cast<DeclarativeBarSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeStackedBarSeries *>(child)) {
                             DeclarativeStackedBarSeries *s = qobject_cast<DeclarativeStackedBarSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativePercentBarSeries *>(child)) {
                             DeclarativePercentBarSeries *s = qobject_cast<DeclarativePercentBarSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeHorizontalBarSeries *>(child)) {
                             DeclarativeHorizontalBarSeries *s = qobject_cast<DeclarativeHorizontalBarSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeHorizontalStackedBarSeries *>(child)) {
                             DeclarativeHorizontalStackedBarSeries *s = qobject_cast<DeclarativeHorizontalStackedBarSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         } else if (qobject_cast<DeclarativeHorizontalPercentBarSeries *>(child)) {
                             DeclarativeHorizontalPercentBarSeries *s = qobject_cast<DeclarativeHorizontalPercentBarSeries *>(child);
                             connect(s, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*)));
                             connect(s, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*)));
                             setAxisX(s->axisX(), s);
                             setAxisY(s->axisY(), s);
                         }
                     }
                 }
                 // Create the missing axes for the series that cannot be painted without axes
                 foreach (QAbstractSeries *chartSeries, m_chart->series())
                     createDefaultAxes(chartSeries);
                 QDeclarativeItem::componentComplete();
             }
             void DeclarativeChart::handleAxisXSet(QAbstractAxis* axis)
             {
             //    qDebug() << "DeclarativeChart::handleAxisXSet" << sender() << axis;
                 if (axis && qobject_cast<QAbstractSeries *>(sender()))
                     m_chart->setAxisX(axis, qobject_cast<QAbstractSeries *>(sender()));
                 else
                     qWarning() << "Trying to set axisX to null.";
             }
             void DeclarativeChart::handleAxisYSet(QAbstractAxis* axis)
             {
             //    qDebug() << "DeclarativeChart::handleAxisYSet" << sender() << axis;
                 if (axis && qobject_cast<QAbstractSeries *>(sender()))
                     m_chart->setAxisY(axis, qobject_cast<QAbstractSeries *>(sender()));
                 else
                     qWarning() << "Trying to set axisY to null.";
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
             //    qDebug() << "DeclarativeChart::geometryChanged" << newGeometry.width() << newGeometry.height();
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         m_chart->resize(newGeometry.width(), newGeometry.height());
                     }
                 }
                 QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
                 // It would be better to trigger the plotAreaChanged signal from QChart::plotAreaChanged or
                 // similar. Since that kind of a signal is not clearly needed in the C++ API the work-around is
                 // to implement it here for the QML API purposes.
                 emit plotAreaChanged(m_chart->plotArea());
             }
             void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
             {
                 QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;
                 if (chartTheme != m_chart->theme())
                     m_chart->setTheme(chartTheme);
             }
             DeclarativeChart::Theme DeclarativeChart::theme()
             {
                 return (DeclarativeChart::Theme) m_chart->theme();
             }
             void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)
             {
                 QChart::AnimationOption animationOptions = (QChart::AnimationOption) animations;
                 if (animationOptions != m_chart->animationOptions())
                     m_chart->setAnimationOptions(animationOptions);
             }
             DeclarativeChart::Animation DeclarativeChart::animationOptions()
             {
                 if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
                     return DeclarativeChart::AllAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
                     return DeclarativeChart::GridAxisAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
                     return DeclarativeChart::SeriesAnimations;
                 else
                     return DeclarativeChart::NoAnimation;
             }
             void DeclarativeChart::setTitle(QString title)
             {
                 if (title != m_chart->title())
                     m_chart->setTitle(title);
             }
             QString DeclarativeChart::title()
             {
                 return m_chart->title();
             }
             QAbstractAxis *DeclarativeChart::axisX(QAbstractSeries *series)
             {
                 return m_chart->axisX(series);
             }
             QAbstractAxis *DeclarativeChart::axisY(QAbstractSeries *series)
             {
                 return m_chart->axisY(series);
             }
             QLegend *DeclarativeChart::legend()
             {
                 return m_chart->legend();
             }
             void DeclarativeChart::setTitleColor(QColor color)
             {
                 QBrush b = m_chart->titleBrush();
                 if (color != b.color()) {
                     b.setColor(color);
                     m_chart->setTitleBrush(b);
                     emit titleColorChanged(color);
                 }
             }
             QFont DeclarativeChart::titleFont() const
             {
                 return m_chart->titleFont();
             }
             void DeclarativeChart::setTitleFont(const QFont& font)
             {
                 m_chart->setTitleFont(font);
             }
             QColor DeclarativeChart::titleColor()
             {
                 return m_chart->titleBrush().color();
             }
             void DeclarativeChart::setBackgroundColor(QColor color)
             {
                 QBrush b = m_chart->backgroundBrush();
                 if (b.style() != Qt::SolidPattern || color != b.color()) {
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                     m_chart->setBackgroundBrush(b);
                     emit backgroundColorChanged();
                 }
             }
             QColor DeclarativeChart::backgroundColor()
             {
                 return m_chart->backgroundBrush().color();
             }
             int DeclarativeChart::count()
             {
                 return m_chart->series().count();
             }
             void DeclarativeChart::setDropShadowEnabled(bool enabled)
             {
                 if (enabled != m_chart->isDropShadowEnabled()) {
                     m_chart->setDropShadowEnabled(enabled);
                     dropShadowEnabledChanged(enabled);
                 }
             }
             bool DeclarativeChart::dropShadowEnabled()
             {
                 return m_chart->isDropShadowEnabled();
             }
             qreal DeclarativeChart::topMargin()
             {
                 qWarning() << "ChartView.topMargin is deprecated. Use minimumMargins and plotArea instead.";
                 return m_chart->plotArea().top();
             }
             qreal DeclarativeChart::bottomMargin()
             {
                 qWarning() << "ChartView.bottomMargin is deprecated. Use minimumMargins and plotArea instead.";
                 return m_chart->plotArea().bottom();
             }
             qreal DeclarativeChart::leftMargin()
             {
                 qWarning() << "ChartView.leftMargin is deprecated. Use minimumMargins and plotArea instead.";
                 return m_chart->plotArea().left();
             }
             qreal DeclarativeChart::rightMargin()
             {
                 qWarning() << "ChartView.rightMargin is deprecated. Use minimumMargins and plotArea instead.";
                 return m_chart->plotArea().right();
             }
             void DeclarativeChart::zoom(qreal factor)
             {
                 m_chart->zoom(factor);
             }
             void DeclarativeChart::scrollLeft(qreal pixels)
             {
                 m_chart->scroll(-pixels, 0);
             }
             void DeclarativeChart::scrollRight(qreal pixels)
             {
                 m_chart->scroll(pixels, 0);
             }
             void DeclarativeChart::scrollUp(qreal pixels)
             {
                 m_chart->scroll(0, pixels);
             }
             void DeclarativeChart::scrollDown(qreal pixels)
             {
                 m_chart->scroll(0, -pixels);
             }
             QAbstractSeries *DeclarativeChart::series(int index)
             {
                 if (index < m_chart->series().count()) {
                     return m_chart->series().at(index);
                 }
                 return 0;
             }
             QAbstractSeries *DeclarativeChart::series(QString seriesName)
             {
                 foreach(QAbstractSeries *series, m_chart->series()) {
                     if (series->name() == seriesName)
                         return series;
                 }
                 return 0;
             }
             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) {
                 case DeclarativeChart::SeriesTypeLine:
                     series = new DeclarativeLineSeries();
                     break;
                 case DeclarativeChart::SeriesTypeArea:
                     series = new DeclarativeAreaSeries();
                     break;
                 case DeclarativeChart::SeriesTypeStackedBar:
                     series = new DeclarativeStackedBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypePercentBar:
                     series = new DeclarativePercentBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypeBar:
                     series = new DeclarativeBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypeHorizontalBar:
                     series = new DeclarativeHorizontalBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypeHorizontalPercentBar:
                     series = new DeclarativeHorizontalPercentBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypeHorizontalStackedBar:
                     series = new DeclarativeHorizontalStackedBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypePie:
                     series = new DeclarativePieSeries();
                     break;
                 case DeclarativeChart::SeriesTypeScatter:
                     series = new DeclarativeScatterSeries();
                     break;
                 case DeclarativeChart::SeriesTypeSpline:
                     series = new DeclarativeSplineSeries();
                     break;
                 default:
                     qWarning() << "Illegal series 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);
                 }
                 return series;
             }
             void DeclarativeChart::setAxisX(QAbstractAxis *axis, QAbstractSeries *series)
             {
                 if (axis)
                     m_chart->setAxisX(axis, series);
             }
             void DeclarativeChart::setAxisY(QAbstractAxis *axis, QAbstractSeries *series)
             {
                 if (axis)
                     m_chart->setAxisY(axis, series);
             }
             void DeclarativeChart::createDefaultAxes()
             {
                 qWarning() << "ChartView.createDefaultAxes() is deprecated. Axes are created automatically.";
             }
             void DeclarativeChart::createDefaultAxes(QAbstractSeries* series)
             {
                 foreach (QAbstractSeries *s, m_chart->series()) {
                     // If there is already an x axis of the correct type, re-use it
                     if (!m_chart->axisX(series) && s != series && m_chart->axisX(s)
                             && m_chart->axisX(s)->type() == series->d_ptr->defaultAxisType(Qt::Horizontal))
                         m_chart->setAxisX(m_chart->axisX(s), series);
                     // If there is already a y axis of the correct type, re-use it
                     if (!m_chart->axisY(series) && s != series && m_chart->axisY(s)
                             && m_chart->axisY(s)->type() == series->d_ptr->defaultAxisType(Qt::Vertical))
                         m_chart->setAxisY(m_chart->axisY(s), series);
                 }
                 // If no x axis of correct type was found, create a new x axis based of default axis type
                 if (!m_chart->axisX(series)) {
                     switch (series->d_ptr->defaultAxisType(Qt::Horizontal)) {
                     case QAbstractAxis::AxisTypeValue:
                         m_chart->setAxisX(new QValueAxis(this), series);
                         break;
                     case QAbstractAxis::AxisTypeBarCategory:
                         m_chart->setAxisX(new QBarCategoryAxis(this), series);
                         break;
                     case QAbstractAxis::AxisTypeCategory:
                         m_chart->setAxisX(new QCategoryAxis(this), series);
                         break;
             #ifndef QT_ON_ARM
                     case QAbstractAxis::AxisTypeDateTime:
                         m_chart->setAxisX(new QDateTimeAxis(this), series);
                         break;
             #endif
                     default:
                         // Do nothing, assume AxisTypeNoAxis
                         break;
                     }
                 }
                 // If no y axis of correct type was found, create a new y axis based of default axis type
                 if (!m_chart->axisY(series)) {
                     switch (series->d_ptr->defaultAxisType(Qt::Vertical)) {
                     case QAbstractAxis::AxisTypeValue:
                         m_chart->setAxisY(new QValueAxis(this), series);
                         break;
                     case QAbstractAxis::AxisTypeBarCategory:
                         m_chart->setAxisY(new QBarCategoryAxis(this), series);
                         break;
                     case QAbstractAxis::AxisTypeCategory:
                         m_chart->setAxisY(new QCategoryAxis(this), series);
                         break;
             #ifndef QT_ON_ARM
                     case QAbstractAxis::AxisTypeDateTime:
                         m_chart->setAxisY(new QDateTimeAxis(this), series);
                         break;
             #endif
                     default:
                         // Do nothing, assume AxisTypeNoAxis
                         break;
                     }
                 }
                 //qDebug() << "axis for series" << series << "x:" << m_chart->axisX(series) << "y:" << m_chart->axisY(series);
             }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativechart.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVECHART_H
             #define DECLARATIVECHART_H
             #include <QtCore/QtGlobal>
             #include <QDeclarativeItem>
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeMargins;
             class DeclarativeChart : public QDeclarativeItem
             {
                 Q_OBJECT
                 Q_PROPERTY(Theme theme READ theme WRITE setTheme)
                 Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
                 Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
                 Q_PROPERTY(QLegend *legend READ legend)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
                 Q_PROPERTY(qreal topMargin READ topMargin)
                 Q_PROPERTY(qreal bottomMargin READ bottomMargin)
                 Q_PROPERTY(qreal leftMargin READ leftMargin)
                 Q_PROPERTY(qreal rightMargin READ rightMargin)
                 Q_PROPERTY(DeclarativeMargins *minimumMargins READ minimumMargins NOTIFY minimumMarginsChanged REVISION 1)
                 Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1)
                 Q_ENUMS(Animation)
                 Q_ENUMS(Theme)
                 Q_ENUMS(SeriesType)
             public:
                 // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
                 enum Theme {
                     ChartThemeLight = 0,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
                     ChartThemeHighContrast,
                     ChartThemeBlueIcy
                 };
                 enum Animation {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                 };
                 enum SeriesType {
                     SeriesTypeLine,
                     SeriesTypeArea,
                     SeriesTypeBar,
                     SeriesTypeStackedBar,
                     SeriesTypePercentBar,
                     SeriesTypePie,
                     SeriesTypeScatter,
                     SeriesTypeSpline,
                     SeriesTypeHorizontalBar,
                     SeriesTypeHorizontalStackedBar,
                     SeriesTypeHorizontalPercentBar
                 };
             public:
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();
             public: // From QDeclarativeItem/QGraphicsItem
                 void childEvent(QChildEvent *event);
                 void componentComplete();
                 void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
             public:
                 void setTheme(DeclarativeChart::Theme theme);
                 DeclarativeChart::Theme theme();
                 void setAnimationOptions(DeclarativeChart::Animation animations);
                 DeclarativeChart::Animation animationOptions();
                 void setTitle(QString title);
                 QString title();
                 QLegend *legend();
                 QFont titleFont() const;
                 void setTitleFont(const QFont& font);
                 void setTitleColor(QColor color);
                 QColor titleColor();
                 void setBackgroundColor(QColor color);
                 QColor backgroundColor();
                 int count();
                 void setDropShadowEnabled(bool enabled);
                 bool dropShadowEnabled();
                 qreal topMargin();
                 qreal bottomMargin();
                 qreal leftMargin();
                 qreal rightMargin();
                 void createDefaultAxes(QAbstractSeries* series);
                 DeclarativeMargins *minimumMargins() { return m_minMargins; }
                 QRectF plotArea() { return m_chart->plotArea(); }
             public:
                 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);
                 Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void createDefaultAxes();
                 Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
                 Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
                 Q_INVOKABLE void zoom(qreal factor);
                 Q_INVOKABLE void scrollLeft(qreal pixels);
                 Q_INVOKABLE void scrollRight(qreal pixels);
                 Q_INVOKABLE void scrollUp(qreal pixels);
                 Q_INVOKABLE void scrollDown(qreal pixels);
             Q_SIGNALS:
                 void axisLabelsChanged();
                 void titleColorChanged(QColor color);
                 void backgroundColorChanged();
                 void dropShadowEnabledChanged(bool enabled);
                 void minimumMarginsChanged();
                 void plotAreaChanged(QRectF plotArea);
             public Q_SLOTS:
                 void changeMinimumMargins(int top, int bottom, int left, int right);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
             private:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;
                 //QMargins m_chartMargins;
                 DeclarativeMargins *m_minMargins;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

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