HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/scatterchart/qscatterseries.h

Merge remote-tracking branch 'origin/5.7' into dev...

Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I86dec1064d79704214e885681449ca347b193d66

Liang Qi - - Load All Authors

File last commit:

r2878:97bb01ce5d85


                r2895:e9a2e2a5e9c0

Download file

             qscatterseries.h
        
                    86 lines
            
             | 3.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / scatterchart / qscatterseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

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

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        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.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add license headers

              r794
            
        Tero Ahola
    
Integrated scatter type series...

              r42
            
      #ifndef QSCATTERSERIES_H

      #define QSCATTERSERIES_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #include <QtCharts/qxyseries.h>

        Tero Ahola
    
Integrated scatter type series...

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
        Tero Ahola
    
Integrated scatter type series...

              r42
            
      class QScatterSeriesPrivate;

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QScatterSeries : public QXYSeries

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      {

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          Q_OBJECT

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

          Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)

        Miikka Heikkinen
    
Made OpenGL series respond to scatter color and size changes...

              r2829
            
          Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape NOTIFY markerShapeChanged)

          Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize NOTIFY markerSizeChanged)

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

              r2681
            
          Q_PROPERTY(QBrush brush READ brush WRITE setBrush)

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          Q_ENUMS(MarkerShape)

        Tero Ahola
    
Scatter series marker visuals

              r195
            
      public:

          enum MarkerShape {

        Michal Klocek
    
Adds missing scatter intercation implementation...

              r541
            
              MarkerShapeCircle,

              MarkerShapeRectangle

        Tero Ahola
    
Scatter series marker visuals

              r195
            
          };

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      public:

        Marc Mutz
    
Make public headers compile with -Wzero-as-null-pointer-constant...

              r2871
            
          explicit QScatterSeries(QObject *parent = Q_NULLPTR);

        Tero Ahola
    
Integrated scatter type series...

              r42
            
          ~QScatterSeries();

        Michal Klocek
    
Fixes to API , QSeriesType -> SeriesType , add missing getters

              r1107
            
          QAbstractSeries::SeriesType type() const;

        Tero Ahola
    
Color and border color properties of XYSeries

              r1537
            
          void setPen(const QPen &pen);

          void setBrush(const QBrush &brush);

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

              r2681
            
          QBrush brush() const;

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          void setColor(const QColor &color);

          QColor color() const;

          void setBorderColor(const QColor &color);

          QColor borderColor() const;

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          MarkerShape markerShape() const;

          void setMarkerShape(MarkerShape shape);

          qreal markerSize() const;

          void setMarkerSize(qreal size);

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
        Tero Ahola
    
Added notifiers for scatter properties

              r1349
            
      Q_SIGNALS:

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          void colorChanged(QColor color);

          void borderColorChanged(QColor color);

        Miikka Heikkinen
    
Made OpenGL series respond to scatter color and size changes...

              r2829
            
          void markerShapeChanged(MarkerShape shape);

          void markerSizeChanged(qreal size);

        Tero Ahola
    
Added notifiers for scatter properties

              r1349
            
        Tero Ahola
    
Integrated scatter type series...

              r42
            
      private:

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

              r1222
            
          Q_DECLARE_PRIVATE(QScatterSeries)

          Q_DISABLE_COPY(QScatterSeries)

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          friend class ScatterChartItem;

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      #endif // QSCATTERSERIES_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	/****************************************************************************
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add license headers	r794	**
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.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add license headers	r794
Tero Ahola Integrated scatter type series...	r42	#ifndef QSCATTERSERIES_H
		#define QSCATTERSERIES_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
Titta Heikkala Qt Charts project file structure change...	r2712	#include <QtCharts/qxyseries.h>
Tero Ahola Integrated scatter type series...	r42
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek Adds big fat pimpl to series classes...	r938
Tero Ahola Integrated scatter type series...	r42	class QScatterSeriesPrivate;

Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QScatterSeries : public QXYSeries
Tero Ahola Integrated scatter type series...	r42	{
Tero Ahola Scatter customization to QML api	r1276	Q_OBJECT
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
		Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829	Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape NOTIFY markerShapeChanged)
		Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize NOTIFY markerSizeChanged)
Titta Heikkala Add possibility to set brush image via QML API...	r2681	Q_PROPERTY(QBrush brush READ brush WRITE setBrush)
Tero Ahola Scatter customization to QML api	r1276	Q_ENUMS(MarkerShape)
Tero Ahola Scatter series marker visuals	r195
		public:
		enum MarkerShape {
Michal Klocek Adds missing scatter intercation implementation...	r541	MarkerShapeCircle,
		MarkerShapeRectangle
Tero Ahola Scatter series marker visuals	r195	};

Tero Ahola Integrated scatter type series...	r42	public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QScatterSeries(QObject *parent = Q_NULLPTR);
Tero Ahola Integrated scatter type series...	r42	~QScatterSeries();
Michal Klocek Fixes to API , QSeriesType -> SeriesType , add missing getters	r1107	QAbstractSeries::SeriesType type() const;
Tero Ahola Color and border color properties of XYSeries	r1537	void setPen(const QPen &pen);
		void setBrush(const QBrush &brush);
Titta Heikkala Add possibility to set brush image via QML API...	r2681	QBrush brush() const;
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void setColor(const QColor &color);
		QColor color() const;
		void setBorderColor(const QColor &color);
		QColor borderColor() const;
Tero Ahola Scatter customization to QML api	r1276	MarkerShape markerShape() const;
		void setMarkerShape(MarkerShape shape);
		qreal markerSize() const;
		void setMarkerSize(qreal size);
Tero Ahola Modifying QScatterSeries API	r179
Tero Ahola Added notifiers for scatter properties	r1349	Q_SIGNALS:
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void colorChanged(QColor color);
		void borderColorChanged(QColor color);
Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829	void markerShapeChanged(MarkerShape shape);
		void markerSizeChanged(qreal size);
Tero Ahola Added notifiers for scatter properties	r1349
Tero Ahola Integrated scatter type series...	r42	private:
Tero Ahola QML weather example to use data API instead of model	r1222	Q_DECLARE_PRIVATE(QScatterSeries)
		Q_DISABLE_COPY(QScatterSeries)
Michal Klocek Adds big fat pimpl to series classes...	r938	friend class ScatterChartItem;
Tero Ahola Integrated scatter type series...	r42	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Tero Ahola Integrated scatter type series...	r42
		#endif // QSCATTERSERIES_H