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

Add support for reversed axis when useOpenGL is true...

Add support for reversed axis when useOpenGL is true Change-Id: If8b6690585c767b65eaa4a43e179c86183903637 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2863:15eed6371853

Download file

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

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** and conditions see https://www.qt.io/terms-conditions. For further

      ** information use the contact form at https://www.qt.io/contact-us.

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Tero Ahola Added area series to QML api	r847	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Tero Ahola Added area series to QML api	r847	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Tero Ahola Added area series to QML api	r847	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Tero Ahola Added area series to QML api	r847	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
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