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

Block opengl series from being used as areaseries edges...

Block opengl series from being used as areaseries edges Change-Id: I33f751e2b4f0cbdbe6fdd8ffb69552ab683f01ba Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2840:8f5b72388cbe

Download file

             declarativeareaseries.h
        
                    92 lines
            
             | 4.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / chartsqml2 / declarativeareaseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Added area series to QML api

              r847
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        Titta Heikkala
    
Updated license headers...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        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.

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

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

        Titta Heikkala
    
Updated license headers...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

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

      #ifndef DECLARATIVEAREASERIES_H

      #define DECLARATIVEAREASERIES_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QAreaSeries>

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
      #include "declarativeaxes.h"

        Tero Ahola
    
Added area series to QML api

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Removed unneeded includes from declarative plugin

              r1831
            
      class DeclarativeLineSeries;

        Tero Ahola
    
Added area series to QML api

              r847
            
        Tero Ahola
    
Now using only one declarative model

              r1169
            
      class DeclarativeAreaSeries : public QAreaSeries

        Tero Ahola
    
Added area series to QML api

              r847
            
      {

          Q_OBJECT

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

              r1202
            
          Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)

          Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)

        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
    
Added missing QML properties to AreaSeries

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

        Titta Heikkala
    
Add possibility to set brush image via QML API...

              r2681
            
          Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4)

          Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4)

        Tero Ahola
    
Added area series to QML api

              r847
            
      public:

          explicit DeclarativeAreaSeries(QObject *parent = 0);

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
          void setUpperSeries(DeclarativeLineSeries *series);

          DeclarativeLineSeries *upperSeries() const;

          void setLowerSeries(DeclarativeLineSeries *series);

          DeclarativeLineSeries *lowerSeries() const;

        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
    
Added missing QML properties to AreaSeries

              r1906
            
          qreal borderWidth() const;

          void setBorderWidth(qreal borderWidth);

        Titta Heikkala
    
Add possibility to set brush image via QML API...

              r2681
            
          QString brushFilename() const;

          void setBrushFilename(const QString &brushFilename);

          void setBrush(const QBrush &brush);

          QBrush brush() const;

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      Q_SIGNALS:

        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 missing QML properties to AreaSeries

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

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

        Titta Heikkala
    
Add possibility to set brush image via QML API...

              r2681
            
          Q_REVISION(4) void brushChanged();

          Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename);

      private Q_SLOTS:

          void handleBrushChanged();

        Tero Ahola
    
Refactored QML axis handling

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

              r2296
            
      public:

          DeclarativeAxes *m_axes;

        Titta Heikkala
    
Add possibility to set brush image via QML API...

              r2681
            
      private:

          QString m_brushFilename;

          QImage m_brushImage;

        Tero Ahola
    
Added area series to QML api

              r847
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Tero Ahola
    
Added area series to QML api

              r847
            
      #endif // DECLARATIVEAREASERIES_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

Tero Ahola Added area series to QML api	r847	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Tero Ahola Added area series to QML api	r847	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Tero Ahola Added area series to QML api	r847	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Tero Ahola Added area series to QML api	r847	**
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.
Tero Ahola Added area series to QML api	r847	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Tero Ahola Added area series to QML api	r847	**
		****************************************************************************/

		#ifndef DECLARATIVEAREASERIES_H
		#define DECLARATIVEAREASERIES_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QAreaSeries>
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	#include "declarativeaxes.h"
Tero Ahola Added area series to QML api	r847
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Removed unneeded includes from declarative plugin	r1831	class DeclarativeLineSeries;
Tero Ahola Added area series to QML api	r847
Tero Ahola Now using only one declarative model	r1169	class DeclarativeAreaSeries : public QAreaSeries
Tero Ahola Added area series to QML api	r847	{
		Q_OBJECT
Tero Ahola Separated series model stuff from data api in QML examples	r1202	Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
		Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
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 Added missing QML properties to AreaSeries	r1906	Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
Titta Heikkala Add possibility to set brush image via QML API...	r2681	Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4)
		Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4)
Tero Ahola Added area series to QML api	r847
		public:
		explicit DeclarativeAreaSeries(QObject *parent = 0);
Jani Honkonen coding style fixes for plugins	r2101	void setUpperSeries(DeclarativeLineSeries *series);
		DeclarativeLineSeries *upperSeries() const;
		void setLowerSeries(DeclarativeLineSeries *series);
		DeclarativeLineSeries *lowerSeries() const;
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 Added missing QML properties to AreaSeries	r1906	qreal borderWidth() const;
		void setBorderWidth(qreal borderWidth);
Titta Heikkala Add possibility to set brush image via QML API...	r2681	QString brushFilename() const;
		void setBrushFilename(const QString &brushFilename);
		void setBrush(const QBrush &brush);
		QBrush brush() const;
Tero Ahola Refactored QML axis handling	r1813
		Q_SIGNALS:
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 missing QML properties to AreaSeries	r1906	Q_REVISION(1) void borderWidthChanged(qreal width);
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);
Titta Heikkala Add possibility to set brush image via QML API...	r2681	Q_REVISION(4) void brushChanged();
		Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename);

		private Q_SLOTS:
		void handleBrushChanged();
Tero Ahola Refactored QML axis handling	r1813
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	public:
		DeclarativeAxes *m_axes;
Titta Heikkala Add possibility to set brush image via QML API...	r2681
		private:
		QString m_brushFilename;
		QImage m_brushImage;
Tero Ahola Added area series to QML api	r847	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Tero Ahola Added area series to QML api	r847
		#endif // DECLARATIVEAREASERIES_H