HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/chartsqml2/declarativelineseries.h

Added possibility to set duration and easing curve for chart animation...

Added possibility to set duration and easing curve for chart animation Changed the animation API so that it's possible to change the duration and easing curve of the chart animation. Change-Id: I2ab3e0664a7f30bc2bb7085daa1d97181edb90ba Task-number: QTRD-3496 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2804:97642714ab1e

Download file

             declarativelineseries.h
        
                    107 lines
            
             | 5.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / chartsqml2 / declarativelineseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add/modify license headers

              r830
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** Copyright (C) 2015 The Qt Company Ltd

        Jani Honkonen
    
Add/modify license headers

              r830
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** For any questions to The Qt Company, please use contact form at http://qt.io

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** Licensees holding valid commercial license for Qt may use this file in

      ** accordance with the Qt License Agreement provided with the Software

      ** or, alternatively, in accordance with the terms contained in a written

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** agreement between you and The Qt Company.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

      ** If you have questions regarding the use of this file, please use

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** contact form at http://qt.io

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

      ****************************************************************************/

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      #ifndef DECLARATIVELINESERIES_H

      #define DECLARATIVELINESERIES_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QLineSeries>

        Tero Ahola
    
Spline to QML API

              r732
            
      #include "declarativexyseries.h"

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
      #include "declarativeaxes.h"

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #include <QtQml/QQmlListProperty>

      #include <QtQml/QQmlParserStatus>

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      {

          Q_OBJECT

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
          Q_INTERFACES(QQmlParserStatus)

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
          Q_PROPERTY(int count READ count NOTIFY countChanged)

        Tero Ahola
    
QML API versioning to QtCommercial.Chart 1.1

              r1857
            
          Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)

          Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)

          Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)

          Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)

          Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)

          Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
          Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
          Q_CLASSINFO("DefaultProperty", "declarativeChildren")

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      public:

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
          explicit DeclarativeLineSeries(QObject *parent = 0);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QXYSeries *xySeries() { return this; }

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          QAbstractAxis *axisX() { return m_axes->axisX(); }

          void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); }

          QAbstractAxis *axisY() { return m_axes->axisY(); }

          void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); }

        Miikka Heikkinen
    
Removed unnecessary Q_REVISION(n) macros....

              r2717
            
          QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }

          void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }

          QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }

          void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }

          QAbstractAxis *axisAngular() { return m_axes->axisX(); }

          void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); }

          QAbstractAxis *axisRadial() { return m_axes->axisY(); }

          void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); }

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          qreal width() const;

          void setWidth(qreal width);

          Qt::PenStyle style() const;

          void setStyle(Qt::PenStyle style);

          Qt::PenCapStyle capStyle() const;

          void setCapStyle(Qt::PenCapStyle capStyle);

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          QQmlListProperty<QObject> declarativeChildren();

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
        Tero Ahola
    
XY model mappers to QML api

              r1278
            
      public: // from QDeclarativeParserStatus

          void classBegin() { DeclarativeXySeries::classBegin(); }

          void componentComplete() { DeclarativeXySeries::componentComplete(); }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      public:

          Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }

          Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }

        Miikka Heikkinen
    
Implement index based removing/replacing points in series...

              r2496
            
          Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
          Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }

        Miikka Heikkinen
    
Implement index based removing/replacing points in series...

              r2496
            
          Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
          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); }

        Tero Ahola
    
QML weather example to use data API instead of model

              r1222
            
        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
      Q_SIGNALS:

          void countChanged(int count);

        Tero Ahola
    
QML API versioning to QtCommercial.Chart 1.1

              r1857
            
          Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);

          Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);

          Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);

          Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          Q_REVISION(1) void widthChanged(qreal width);

          Q_REVISION(1) void styleChanged(Qt::PenStyle style);

          Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
      public Q_SLOTS:

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          static void appendDeclarativeChildren(QQmlListProperty<QObject> *list, QObject *element);

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
          void handleCountChanged(int index);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
      public:

          DeclarativeAxes *m_axes;

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      #endif // DECLARATIVELINESERIES_H

	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

Jani Honkonen Add/modify license headers	r830	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Jani Honkonen Add/modify license headers	r830	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Jani Honkonen Add/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Jani Honkonen Add/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2740	** Licensees holding valid commercial license for Qt may use this file in
		** accordance with the Qt License Agreement provided with the Software
		** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala Copyright header changes...	r2776	** agreement between you and The Qt Company.
Jani Honkonen Add/modify license headers	r830	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Jani Honkonen Add/modify license headers	r830	**
		****************************************************************************/

Tero Ahola Dynamic data for QML pie and line series	r215	#ifndef DECLARATIVELINESERIES_H
		#define DECLARATIVELINESERIES_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QLineSeries>
Tero Ahola Spline to QML API	r732	#include "declarativexyseries.h"
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	#include "declarativeaxes.h"
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488
		#include <QtQml/QQmlListProperty>
		#include <QtQml/QQmlParserStatus>
Tero Ahola Dynamic data for QML pie and line series	r215
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Dynamic data for QML pie and line series	r215
Titta Heikkala Qt Charts project file structure change...	r2712	class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus
Tero Ahola Dynamic data for QML pie and line series	r215	{
		Q_OBJECT
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	Q_INTERFACES(QQmlParserStatus)
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	Q_PROPERTY(int count READ count NOTIFY countChanged)
Tero Ahola QML API versioning to QtCommercial.Chart 1.1	r1857	Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
		Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
		Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
Miikka Heikkinen Add Polar chart support...	r2483	Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
		Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
Tero Ahola Adding missing QML series API line/border properties	r1904	Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
		Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
		Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)
Tero Ahola Separated series model stuff from data api in QML examples	r1202	Q_CLASSINFO("DefaultProperty", "declarativeChildren")
Tero Ahola Dynamic data for QML pie and line series	r215
		public:
Tero Ahola Declarative series classed now derived from QSeries childs	r789	explicit DeclarativeLineSeries(QObject *parent = 0);
Tero Ahola Refactored QML axis handling	r1813	QXYSeries *xySeries() { return this; }
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	QAbstractAxis *axisX() { return m_axes->axisX(); }
		void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
		QAbstractAxis *axisY() { return m_axes->axisY(); }
		void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
Miikka Heikkinen Removed unnecessary Q_REVISION(n) macros....	r2717	QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
		void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
		QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
		void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
		QAbstractAxis *axisAngular() { return m_axes->axisX(); }
		void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
		QAbstractAxis *axisRadial() { return m_axes->axisY(); }
		void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
Tero Ahola Adding missing QML series API line/border properties	r1904	qreal width() const;
		void setWidth(qreal width);
		Qt::PenStyle style() const;
		void setStyle(Qt::PenStyle style);
		Qt::PenCapStyle capStyle() const;
		void setCapStyle(Qt::PenCapStyle capStyle);
Titta Heikkala Qt Charts project file structure change...	r2712	QQmlListProperty<QObject> declarativeChildren();
Tero Ahola Separated series model stuff from data api in QML examples	r1202
Tero Ahola XY model mappers to QML api	r1278	public: // from QDeclarativeParserStatus
		void classBegin() { DeclarativeXySeries::classBegin(); }
		void componentComplete() { DeclarativeXySeries::componentComplete(); }

Tero Ahola QML methods of series: several fixes and documentation	r1521	public:
		Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
		Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
Miikka Heikkinen Implement index based removing/replacing points in series...	r2496	Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
Tero Ahola QML methods of series: several fixes and documentation	r1521	Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
Miikka Heikkinen Implement index based removing/replacing points in series...	r2496	Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
Tero Ahola QML methods of series: several fixes and documentation	r1521	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); }
Tero Ahola QML weather example to use data API instead of model	r1222
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	Q_SIGNALS:
		void countChanged(int count);
Tero Ahola QML API versioning to QtCommercial.Chart 1.1	r1857	Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
		Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);
		Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);
Miikka Heikkinen Add Polar chart support...	r2483	Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);
		Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);
Tero Ahola Adding missing QML series API line/border properties	r1904	Q_REVISION(1) void widthChanged(qreal width);
		Q_REVISION(1) void styleChanged(Qt::PenStyle style);
		Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465
Tero Ahola Separated series model stuff from data api in QML examples	r1202	public Q_SLOTS:
Titta Heikkala Qt Charts project file structure change...	r2712	static void appendDeclarativeChildren(QQmlListProperty<QObject> list, QObject element);
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	void handleCountChanged(int index);
Tero Ahola Refactored QML axis handling	r1813
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	public:
		DeclarativeAxes *m_axes;
Tero Ahola Dynamic data for QML pie and line series	r215	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Tero Ahola Dynamic data for QML pie and line series	r215
		#endif // DECLARATIVELINESERIES_H