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

Revert "Remove TODOs for 1.2.1 release, revert this after release"...

Revert "Remove TODOs for 1.2.1 release, revert this after release" This reverts commit 9df61547fec62d7a608dd8cd2be94e04ed0f92e3. Release has been done, so bring back the TODOs. Change-Id: I1362a254a7f9c9c2f0b659b72af29638a980a394 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d


                r2477:56fd46a39576

Download file

             qlegendmarker.h
        
                    104 lines
            
             | 2.8 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / legend / qlegendmarker.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
      /****************************************************************************

       **

        Miikka Heikkinen
    
Fixed the copyright year 2012 -> 2013

              r2432
            
       ** Copyright (C) 2013 Digia Plc

        sauimone
    
first prototry of QLegendMarker API

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

       **

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

      #ifndef QLEGENDMARKER_H

      #define QLEGENDMARKER_H

      #include <QChartGlobal>

      #include <QObject>

      #include <QPen>

      #include <QBrush>

        sauimone
    
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit

              r2163
            
      #include <QFont>

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit

              r2163
            
      class QLegendMarkerPrivate;

        sauimone
    
new legend example for testing new api. Currently using still the old one.

              r2162
            
      class QAbstractSeries;

        sauimone
    
removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction

              r2171
            
      class QLegend;

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
      class QTCOMMERCIALCHART_EXPORT QLegendMarker : public QObject

      {

          Q_OBJECT

        sauimone
    
oops. LegendMarkerType enum wasn't public

              r2180
            
      public:

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          enum LegendMarkerType {

              LegendMarkerTypeArea,

              LegendMarkerTypeBar,

              LegendMarkerTypePie,

              LegendMarkerTypeXY

          };

        sauimone
    
signals for properties in legendmarker

              r2225
            
          Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)

          Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)

          Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)

          Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)

          Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)

          Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)

        sauimone
    
properties to legendmarker. doc update

              r2224
            
          Q_ENUMS(LegendMarkerType)

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
      public:

          virtual ~QLegendMarker();

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          virtual LegendMarkerType type() = 0;

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
          QString label() const;

          void setLabel(const QString &label);

        sauimone
    
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit

              r2163
            
          QBrush labelBrush() const;

          void setLabelBrush(const QBrush &brush);

          QFont font() const;

          void setFont(const QFont &font);

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
          QPen pen() const;

          void setPen(const QPen &pen);

          QBrush brush() const;

          void setBrush(const QBrush &brush);

          bool isVisible() const;

          void setVisible(bool visible);

        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 QAbstractSeries* series() = 0;

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
      Q_SIGNALS:

          void clicked();

          void hovered(bool status);

        sauimone
    
signals for properties in legendmarker

              r2225
            
          void labelChanged();

          void labelBrushChanged();

          void fontChanged();

          void penChanged();

          void brushChanged();

          void visibleChanged();

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
        sauimone
    
refactoring

              r2167
            
      protected:

        sauimone
    
Better handling for new or removed markers

              r2182
            
          explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0);

        sauimone
    
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit

              r2163
            
          QScopedPointer<QLegendMarkerPrivate> d_ptr;

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
          Q_DISABLE_COPY(QLegendMarker)

        sauimone
    
refactoring

              r2167
            
          friend class QLegendPrivate;

          friend class QLegendMarkerPrivate;

        sauimone
    
Legend can now handle clicked and do scrolling

              r2183
            
          friend class LegendMarkerItem;

        sauimone
    
layout work started

              r2168
            
          friend class LegendLayout;

        sauimone
    
added missing friend declaration

              r2198
            
          friend class LegendScroller;

        sauimone
    
first prototry of QLegendMarker API

              r2160
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // QLEGENDMARKER_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

sauimone first prototry of QLegendMarker API	r2160	/****************************************************************************
		**
Miikka Heikkinen Fixed the copyright year 2012 -> 2013	r2432	** Copyright (C) 2013 Digia Plc
sauimone first prototry of QLegendMarker API	r2160	** 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$
		**
		****************************************************************************/

		#ifndef QLEGENDMARKER_H
		#define QLEGENDMARKER_H

		#include <QChartGlobal>
		#include <QObject>
		#include <QPen>
		#include <QBrush>
sauimone Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit	r2163	#include <QFont>
sauimone first prototry of QLegendMarker API	r2160
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit	r2163	class QLegendMarkerPrivate;
sauimone new legend example for testing new api. Currently using still the old one.	r2162	class QAbstractSeries;
sauimone removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction	r2171	class QLegend;
sauimone first prototry of QLegendMarker API	r2160
		class QTCOMMERCIALCHART_EXPORT QLegendMarker : public QObject
		{
		Q_OBJECT

sauimone oops. LegendMarkerType enum wasn't public	r2180	public:
sauimone removed peer object solution. Introduced marker type solution	r2179	enum LegendMarkerType {
		LegendMarkerTypeArea,
		LegendMarkerTypeBar,
		LegendMarkerTypePie,
		LegendMarkerTypeXY
		};

sauimone signals for properties in legendmarker	r2225	Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
		Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
		Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
		Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
		Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
		Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
sauimone properties to legendmarker. doc update	r2224	Q_ENUMS(LegendMarkerType)
sauimone first prototry of QLegendMarker API	r2160
		public:
		virtual ~QLegendMarker();
sauimone removed peer object solution. Introduced marker type solution	r2179	virtual LegendMarkerType type() = 0;
sauimone first prototry of QLegendMarker API	r2160
		QString label() const;
		void setLabel(const QString &label);

sauimone Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit	r2163	QBrush labelBrush() const;
		void setLabelBrush(const QBrush &brush);

		QFont font() const;
		void setFont(const QFont &font);

sauimone first prototry of QLegendMarker API	r2160	QPen pen() const;
		void setPen(const QPen &pen);

		QBrush brush() const;
		void setBrush(const QBrush &brush);

		bool isVisible() const;
		void setVisible(bool visible);

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 QAbstractSeries* series() = 0;

sauimone first prototry of QLegendMarker API	r2160	Q_SIGNALS:
		void clicked();
		void hovered(bool status);
sauimone signals for properties in legendmarker	r2225	void labelChanged();
		void labelBrushChanged();
		void fontChanged();
		void penChanged();
		void brushChanged();
		void visibleChanged();
sauimone first prototry of QLegendMarker API	r2160
sauimone refactoring	r2167	protected:
sauimone Better handling for new or removed markers	r2182	explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0);

sauimone Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit	r2163	QScopedPointer<QLegendMarkerPrivate> d_ptr;
sauimone first prototry of QLegendMarker API	r2160	Q_DISABLE_COPY(QLegendMarker)
sauimone refactoring	r2167	friend class QLegendPrivate;
		friend class QLegendMarkerPrivate;
sauimone Legend can now handle clicked and do scrolling	r2183	friend class LegendMarkerItem;
sauimone layout work started	r2168	friend class LegendLayout;
sauimone added missing friend declaration	r2198	friend class LegendScroller;
sauimone first prototry of QLegendMarker API	r2160	};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // QLEGENDMARKER_H