HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · plugins/declarative/declarativescatterseries.h

Fixed a build issue with metatype declaration in decl plugin

Marek Rosa - - Load All Authors

File last commit:

r2052:7140e4975cd3


                r2117:44f56122f6c5

Download file

             declarativescatterseries.h
        
                    87 lines
            
             | 3.5 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / plugins / declarative / declarativescatterseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add/modify license headers

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

      **

      ** 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$

      **

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

        Tero Ahola
    
Proposal for QML data API

              r196
            
      #ifndef DECLARATIVESCATTERSERIES_H

      #define DECLARATIVESCATTERSERIES_H

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      #include "qscatterseries.h"

        Tero Ahola
    
Spline to QML API

              r732
            
      #include "declarativexyseries.h"

        Marek Rosa
    
Qt5: declarative fix part1...

              r2052
            
      #ifdef QT5_QUICK_1

          #include <QtQuick1/QDeclarativeListProperty>

          #include <QtQuick1/QDeclarativeParserStatus>

      #else

          #include <QtDeclarative/QDeclarativeListProperty>

          #include <QtDeclarative/QDeclarativeParserStatus>

      #endif

        Tero Ahola
    
Proposal for QML data API

              r196
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Tero Ahola
    
XY model mappers to QML api

              r1278
            
      class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QDeclarativeParserStatus

        Tero Ahola
    
Proposal for QML data API

              r196
            
      {

          Q_OBJECT

        Tero Ahola
    
XY model mappers to QML api

              r1278
            
          Q_INTERFACES(QDeclarativeParserStatus)

        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
    
Adding missing QML series API line/border properties

              r1904
            
          Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
          Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)

          Q_CLASSINFO("DefaultProperty", "declarativeChildren")

        Tero Ahola
    
Proposal for QML data API

              r196
            
      public:

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
          explicit DeclarativeScatterSeries(QObject *parent = 0);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QXYSeries *xySeries() { return this; }

          QAbstractAxis *axisX() { return m_axisX; }

          void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }

          QAbstractAxis *axisY() { return m_axisY; }

          void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          qreal borderWidth() const;

          void setBorderWidth(qreal borderWidth);

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
          QDeclarativeListProperty<QObject> declarativeChildren();

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

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

          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
    
Adding missing QML series API line/border properties

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

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

              r1465
            
        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      public Q_SLOTS:

          static void appendDeclarativeChildren(QDeclarativeListProperty<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
            
      private:

          QAbstractAxis *m_axisX;

          QAbstractAxis *m_axisY;

        Tero Ahola
    
Proposal for QML data API

              r196
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // DECLARATIVESCATTERSERIES_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	/****************************************************************************
		**
		** 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$
		**
		****************************************************************************/

Tero Ahola Proposal for QML data API	r196	#ifndef DECLARATIVESCATTERSERIES_H
		#define DECLARATIVESCATTERSERIES_H

Tero Ahola Declarative series classed now derived from QSeries childs	r789	#include "qscatterseries.h"
Tero Ahola Spline to QML API	r732	#include "declarativexyseries.h"
Marek Rosa Qt5: declarative fix part1...	r2052	#ifdef QT5_QUICK_1
		#include <QtQuick1/QDeclarativeListProperty>
		#include <QtQuick1/QDeclarativeParserStatus>
		#else
		#include <QtDeclarative/QDeclarativeListProperty>
		#include <QtDeclarative/QDeclarativeParserStatus>
		#endif
Tero Ahola Proposal for QML data API	r196
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Tero Ahola XY model mappers to QML api	r1278	class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
Tero Ahola Proposal for QML data API	r196	{
		Q_OBJECT
Tero Ahola XY model mappers to QML api	r1278	Q_INTERFACES(QDeclarativeParserStatus)
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 Adding missing QML series API line/border properties	r1904	Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
Tero Ahola QML and static data in pie and xy series	r1186	Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
		Q_CLASSINFO("DefaultProperty", "declarativeChildren")
Tero Ahola Proposal for QML data API	r196
		public:
Tero Ahola Declarative series classed now derived from QSeries childs	r789	explicit DeclarativeScatterSeries(QObject *parent = 0);
Tero Ahola Refactored QML axis handling	r1813	QXYSeries *xySeries() { return this; }
		QAbstractAxis *axisX() { return m_axisX; }
		void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
		QAbstractAxis *axisY() { return m_axisY; }
		void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
Tero Ahola Adding missing QML series API line/border properties	r1904	qreal borderWidth() const;
		void setBorderWidth(qreal borderWidth);
Tero Ahola QML and static data in pie and xy series	r1186	QDeclarativeListProperty<QObject> declarativeChildren();

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); }
		Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
		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 Adding missing QML series API line/border properties	r1904	Q_REVISION(1) void borderWidthChanged(qreal width);
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465
Tero Ahola QML and static data in pie and xy series	r1186	public Q_SLOTS:
		static void appendDeclarativeChildren(QDeclarativeListProperty<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
		private:
		QAbstractAxis *m_axisX;
		QAbstractAxis *m_axisY;
Tero Ahola Proposal for QML data API	r196	};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // DECLARATIVESCATTERSERIES_H