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

some cleanup on legend and pie. No need for pie to know too much about legend

sauimone - - Load All Authors

File last commit:

r2171:c0bd0c4881b1


                r2173:8e5e86b8b162

Download file

             qlegendmarker_p.h
        
                    115 lines
            
             | 2.9 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / legend / qlegendmarker_p.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        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
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 Digia Plc

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

      **

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

      //  W A R N I N G

      //  -------------

      //

      // This file is not part of the QtCommercial Chart API.  It exists purely as an

      // implementation detail.  This header file may change from version to

      // version without notice, or even be removed.

      //

      // We mean it.

      #ifndef QLEGENDMARKERPRIVATE_H

      #define QLEGENDMARKERPRIVATE_H

      #include "qchartglobal.h"

      #include <QGraphicsObject>

      #include <QBrush>

      #include <QPen>

      #include <QGraphicsSimpleTextItem>

      #include <QGraphicsLayoutItem>

        sauimone
    
refactoring

              r2167
            
      #include <QDebug>

        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
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      // TODO: check these

      class QAbstractSeries;

      class QAreaSeries;

      class QXYSeries;

      class QBarSet;

      class QAbstractBarSeries;

      class QPieSlice;

      class QLegend;

      class QPieSeries;

      class QLegendMarker;

        sauimone
    
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker

              r2164
            
      class LegendMarkerItem;

        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
            
        sauimone
    
legendmarker private is just QObject

              r2165
            
      class QLegendMarkerPrivate : public QObject

        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
            
      {

          Q_OBJECT

      public:

        sauimone
    
refactoring

              r2167
            
      //    explicit QLegendMarkerPrivate(QAbstractSeries *series, QLegendMarker *q);

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

              r2171
            
          explicit QLegendMarkerPrivate(QLegendMarker *q, QLegend *legend);

        sauimone
    
QPieLegenmarkerPrivate added

              r2166
            
          virtual ~QLegendMarkerPrivate();

        sauimone
    
layout work started

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

              r2171
            
          // TODO: remove temporary setters/getters and use the m_item directly from public class via d_ptr

        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
            
          void setPen(const QPen &pen);

          QPen pen() const;

          void setBrush(const QBrush &brush);

          QBrush brush() const;

          void setFont(const QFont &font);

          QFont font() const;

          void setLabel(const QString label);

          QString label() const;

          void setLabelBrush(const QBrush &brush);

          QBrush labelBrush() const;

        sauimone
    
layout work started

              r2168
            
          bool isVisible() const;

          void setVisible(bool visible);

        sauimone
    
refactoring

              r2167
            
          // Helper for now.

          LegendMarkerItem* item() const { return m_item; }

          // Item gets the event, logic for event is here

          void handleMousePressEvent(QGraphicsSceneEvent *event);

        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
            
      public Q_SLOTS:

          virtual void updated() {};

        sauimone
    
refactoring

              r2167
            
      protected:

        sauimone
    
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker

              r2164
            
          LegendMarkerItem *m_item;

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

              r2171
            
          QLegend* m_legend;

        sauimone
    
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker

              r2164
            
        sauimone
    
refactoring

              r2167
            
      private:

          QLegendMarker *q_ptr;

        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
            
      // New legend marker properties

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

              r2171
            
      // Moved to item.

        sauimone
    
layout work started

              r2168
            
      /*

        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
            
          QString m_label;

          QBrush m_labelBrush;

          QFont m_font;

          QPen m_pen;

          QBrush m_brush;

          bool m_visible;

        sauimone
    
layout work started

              r2168
            
      */

        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
            
          friend class QLegendPrivate; // TODO: Is this needed?

          Q_DECLARE_PUBLIC(QLegendMarker)

      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // QLEGENDMARKERPRIVATE_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 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	/****************************************************************************
		**
		** Copyright (C) 2012 Digia Plc
		** 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$
		**
		****************************************************************************/

		// W A R N I N G
		// -------------
		//
		// This file is not part of the QtCommercial Chart API. It exists purely as an
		// implementation detail. This header file may change from version to
		// version without notice, or even be removed.
		//
		// We mean it.

		#ifndef QLEGENDMARKERPRIVATE_H
		#define QLEGENDMARKERPRIVATE_H

		#include "qchartglobal.h"
		#include <QGraphicsObject>
		#include <QBrush>
		#include <QPen>
		#include <QGraphicsSimpleTextItem>
		#include <QGraphicsLayoutItem>
sauimone refactoring	r2167	#include <QDebug>
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
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		// TODO: check these
		class QAbstractSeries;
		class QAreaSeries;
		class QXYSeries;
		class QBarSet;
		class QAbstractBarSeries;
		class QPieSlice;
		class QLegend;
		class QPieSeries;

		class QLegendMarker;
sauimone added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker	r2164	class LegendMarkerItem;
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
sauimone legendmarker private is just QObject	r2165	class QLegendMarkerPrivate : public QObject
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	{
		Q_OBJECT
		public:
sauimone refactoring	r2167	// explicit QLegendMarkerPrivate(QAbstractSeries series, QLegendMarker q);
sauimone removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction	r2171	explicit QLegendMarkerPrivate(QLegendMarker q, QLegend legend);
sauimone QPieLegenmarkerPrivate added	r2166	virtual ~QLegendMarkerPrivate();
sauimone layout work started	r2168
sauimone removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction	r2171	// TODO: remove temporary setters/getters and use the m_item directly from public class via d_ptr
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	void setPen(const QPen &pen);
		QPen pen() const;

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

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

		void setLabel(const QString label);
		QString label() const;

		void setLabelBrush(const QBrush &brush);
		QBrush labelBrush() const;
sauimone layout work started	r2168
		bool isVisible() const;
		void setVisible(bool visible);

sauimone refactoring	r2167	// Helper for now.
		LegendMarkerItem* item() const { return m_item; }

		// Item gets the event, logic for event is here
		void handleMousePressEvent(QGraphicsSceneEvent *event);
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
		public Q_SLOTS:
		virtual void updated() {};

sauimone refactoring	r2167	protected:
sauimone added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker	r2164	LegendMarkerItem *m_item;
sauimone removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction	r2171	QLegend* m_legend;
sauimone added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker	r2164
sauimone refactoring	r2167	private:
		QLegendMarker *q_ptr;
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
		// New legend marker properties
sauimone removing old commented code. removing domain parameter from handleseriesadded of pimpl. adding QLegend parameter to marker construction	r2171	// Moved to item.
sauimone layout work started	r2168	/*
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	QString m_label;
		QBrush m_labelBrush;
		QFont m_font;
		QPen m_pen;
		QBrush m_brush;
		bool m_visible;
sauimone layout work started	r2168	*/
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	friend class QLegendPrivate; // TODO: Is this needed?
		Q_DECLARE_PUBLIC(QLegendMarker)
		};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // QLEGENDMARKERPRIVATE_H