HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/legend/qbarlegendmarker.h

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

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: sync.profile Change-Id: Icdf61d347a6d0b3624867ceb8c1e4220c6c78a76

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2866:bbf52870f4e3

Download file

             qbarlegendmarker.h
        
                    66 lines
            
             | 2.2 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / legend / qbarlegendmarker.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

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

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      **

        Miikka Heikkinen
    
Updated license...

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

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

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      **

        Miikka Heikkinen
    
Updated license...

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

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      **

        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.

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

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

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      #ifndef QBARLEGENDMARKER_H

      #define QBARLEGENDMARKER_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #include <QtCharts/QLegendMarker>

      #include <QtCharts/QAbstractBarSeries>

      #include <QtCharts/QBarSet>

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      class QLegend;

      class QBarLegendMarkerPrivate;

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      {

          Q_OBJECT

      public:

        sauimone
    
optional series parameter to markers function. code style fixes

              r2193
            
          explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = 0);

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
          virtual ~QBarLegendMarker();

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          virtual LegendMarkerType type() { return LegendMarkerTypeBar; }

          // Related series and barset

        sauimone
    
pure virtual getter for series to QLegendMarker. In some cases user don't need the derived pointer. This removes the need to cast to derived marker type

              r2181
            
          virtual QAbstractBarSeries* series();

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          QBarSet* barset();

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      protected:

          QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = 0);

      private:

          Q_DECLARE_PRIVATE(QBarLegendMarker)

          Q_DISABLE_COPY(QBarLegendMarker)

      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        sauimone
    
tidying up legend marker code. Added QBarLegendMarker

              r2174
            
      #endif // QBARLEGENDMARKER_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	/****************************************************************************
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	**
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.
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	#ifndef QBARLEGENDMARKER_H
		#define QBARLEGENDMARKER_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
Titta Heikkala Qt Charts project file structure change...	r2712	#include <QtCharts/QLegendMarker>
		#include <QtCharts/QAbstractBarSeries>
		#include <QtCharts/QBarSet>
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174
		class QLegend;
		class QBarLegendMarkerPrivate;

Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	{
		Q_OBJECT
		public:
sauimone optional series parameter to markers function. code style fixes	r2193	explicit QBarLegendMarker(QAbstractBarSeries series, QBarSet barset, QLegend legend, QObject parent = 0);
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174	virtual ~QBarLegendMarker();

sauimone removed peer object solution. Introduced marker type solution	r2179	virtual LegendMarkerType type() { return LegendMarkerTypeBar; }

		// Related series and barset
sauimone pure virtual getter for series to QLegendMarker. In some cases user don't need the derived pointer. This removes the need to cast to derived marker type	r2181	virtual QAbstractBarSeries* series();
sauimone removed peer object solution. Introduced marker type solution	r2179	QBarSet* barset();
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174
		protected:
		QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = 0);

		private:
		Q_DECLARE_PRIVATE(QBarLegendMarker)
		Q_DISABLE_COPY(QBarLegendMarker)

		};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
sauimone tidying up legend marker code. Added QBarLegendMarker	r2174
		#endif // QBARLEGENDMARKER_H