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

Fix for not overriding user settings for legend markers....

Fix for not overriding user settings for legend markers. Added check if the user has set custom label, pen or brush. In this case these are not taken from the series. Task-number: QTRD-1918 Reviewed-by: Miikka Heikkinen

Marek Rosa - - Load All Authors

File last commit:

r2275:95c64613f4b2


                r2429:d1e41c29fbb9

Download file

             chartpresenter_p.h
        
                    167 lines
            
             | 4.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / chartpresenter_p.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

              r794
            
      /****************************************************************************

      **

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

      **

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

        unknown
    
Added missing warning about private implementation

              r1366
            
      //  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.

        Michal Klocek
    
Fixes header guard style issues

              r969
            
      #ifndef CHARTPRESENTER_H

      #define CHARTPRESENTER_H

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      #include "qchartglobal.h"

        Michal Klocek
    
Refactor themes...

              r143
            
      #include "qchart.h" //becouse of QChart::ChartThemeId //TODO

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      #include <QRectF>

        Michal Klocek
    
Implements minimumMargins...

              r1883
            
      #include <QMargins>

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Refactors internals...

              r2273
            
      class ChartItem;

      class AxisItem;

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      class QAbstractSeries;

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      class ChartDataSet;

        Marek Rosa
    
Domains added

              r2275
            
      class AbstractDomain;

        Michal Klocek
    
Changes QChartAxis -> QAxis

              r1006
            
      class ChartAxis;

        Michal Klocek
    
Animation refactor...

              r530
            
      class ChartAnimator;

        Michal Klocek
    
Changes QChartAxis -> QAxis

              r1006
            
      class ChartBackground;

        Michal Klocek
    
Refactors layout...

              r1965
            
      class ChartTitle;

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      class ChartAnimation;

        Michal Klocek
    
Refactors layout managment...

              r1534
            
      class ChartLayout;

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      class ChartPresenter: public QObject

      {

          Q_OBJECT

      public:

        Tero Ahola
    
Fixed drawing issues in Scatter

              r375
            
          enum ZValues {

              BackgroundZValue = -1,

        Michal Klocek
    
Fixes mouse handling in base class of chartseries

              r1747
            
              ShadesZValue ,

        Tero Ahola
    
Fixed drawing issues in Scatter

              r375
            
              GridZValue,

        Tero Ahola
    
Switched the z-order of axis to be below series...

              r1790
            
              AxisZValue,

        Tero Ahola
    
All the series to use the same z-plane

              r1260
            
              SeriesZValue,

              LineChartZValue = SeriesZValue,

        Michal Klocek
    
Fixes mouse handling in base class of chartseries

              r1747
            
              SplineChartZValue = SeriesZValue,

        Tero Ahola
    
All the series to use the same z-plane

              r1260
            
              BarSeriesZValue = SeriesZValue,

              ScatterSeriesZValue = SeriesZValue,

              PieSeriesZValue = SeriesZValue,

        Michal Klocek
    
Fixes mouse handling in base class of chartseries

              r1747
            
              LegendZValue,

              TopMostZValue

        Tero Ahola
    
Fixed drawing issues in Scatter

              r375
            
          };

        Tero Ahola
    
All the series to use the same z-plane

              r1260
            
          enum State {

              ShowState,

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
              ScrollUpState,

              ScrollDownState,

              ScrollLeftState,

              ScrollRightState,

              ZoomInState,

              ZoomOutState

          };

        Michal Klocek
    
Adds ZOrder enum to presenter

              r262
            
        Michal Klocek
    
Refactors internals...

              r2273
            
          ChartPresenter(QChart *chart);

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
          virtual ~ChartPresenter();

        Michal Klocek
    
Refactored for MVP...

              r139
            
        Michal Klocek
    
Refactors internals...

              r2273
            
          void setGeometry(QRectF rect);

          QRectF geometry() const;

          QGraphicsItem *rootItem(){ return m_chart; }

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          ChartBackground *backgroundElement();

          ChartTitle *titleElement();

          QList<ChartAxis *> axisItems() const;

        Michal Klocek
    
Refactors internals...

              r2273
            
          QList<ChartItem *> chartItems() const;

          ChartItem* chartElement(QAbstractSeries* series) const;

          ChartAxis* chartElement(QAbstractAxis* axis) const;

        Michal Klocek
    
Refactors layout managment...

              r1534
            
        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          QLegend *legend();

        Michal Klocek
    
Refactors layout managment...

              r1534
            
        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void setBackgroundBrush(const QBrush &brush);

        Michal Klocek
    
Refactors layout managment...

              r1534
            
          QBrush backgroundBrush() const;

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void setBackgroundPen(const QPen &pen);

        Michal Klocek
    
Refactors layout managment...

              r1534
            
          QPen backgroundPen() const;

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void setTitle(const QString &title);

        Michal Klocek
    
Refactors layout managment...

              r1534
            
          QString title() const;

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void setTitleFont(const QFont &font);

        Michal Klocek
    
Refactors layout managment...

              r1534
            
          QFont titleFont() const;

          void setTitleBrush(const QBrush &brush);

          QBrush titleBrush() const;

          void setBackgroundVisible(bool visible);

          bool isBackgroundVisible() const;

          void setBackgroundDropShadowEnabled(bool enabled);

          bool isBackgroundDropShadowEnabled() const;

          void setVisible(bool visible);

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
        Michal Klocek
    
Adds animation settings handling

              r298
            
          void setAnimationOptions(QChart::AnimationOptions options);

          QChart::AnimationOptions animationOptions() const;

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void startAnimation(ChartAnimation *animation);

        Michal Klocek
    
Refactors internals...

              r2273
            
          //TODO refactor

          void setState(State state,QPointF point);

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          State state() const { return m_state; }

          QPointF statePoint() const { return m_statePoint; }

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          ChartLayout *layout();

        Michal Klocek
    
Refactors layout managment...

              r1534
            
      private:

          void createBackgroundItem();

          void createTitleItem();

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
        sauimone
    
Q_SIGNALS and Q_SLOTS

              r775
            
      public Q_SLOTS:

        Michal Klocek
    
Refactors internals...

              r2273
            
          void handleSeriesAdded(QAbstractSeries *series);

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void handleSeriesRemoved(QAbstractSeries *series);

        Michal Klocek
    
Refactors internals...

              r2273
            
          void handleAxisAdded(QAbstractAxis *axis);

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          void handleAxisRemoved(QAbstractAxis *axis);

        Michal Klocek
    
Refactor domain model...

              r439
            
        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      private Q_SLOTS:

          void handleAnimationFinished();

        sauimone
    
Q_SIGNALS and Q_SLOTS

              r775
            
      Q_SIGNALS:

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          void animationsFinished();

        Michal Klocek
    
Refactor qledgend handling...

              r855
            
        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      private:

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          QChart *m_chart;

        Michal Klocek
    
Refactors internals...

              r2273
            
          QList<ChartItem *> m_chartItems;

          QList<ChartAxis *> m_axisItems;

          QList<QAbstractSeries *> m_series;

          QList<QAbstractAxis *> m_axes;

        Michal Klocek
    
Adds animation settings handling

              r298
            
          QChart::AnimationOptions m_options;

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          State m_state;

          QPointF m_statePoint;

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          QList<ChartAnimation *> m_animations;

          ChartLayout *m_layout;

          ChartBackground *m_background;

          ChartTitle *m_title;

        Michal Klocek
    
Refactors internals...

              r2273
            
          QRectF m_rect;

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

        Jani Honkonen
    
Fix Krazy issues

              r1935
            
      #endif /* CHARTPRESENTER_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

Jani Honkonen Add license headers	r794	/****************************************************************************
		**
		** 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$
		**
		****************************************************************************/

unknown Added missing warning about private implementation	r1366	// 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.

Michal Klocek Fixes header guard style issues	r969	#ifndef CHARTPRESENTER_H
		#define CHARTPRESENTER_H
Michal Klocek Refactors qchart , adds line animation...	r131
		#include "qchartglobal.h"
Michal Klocek Refactor themes...	r143	#include "qchart.h" //becouse of QChart::ChartThemeId //TODO
Michal Klocek Refactors qchart , adds line animation...	r131	#include <QRectF>
Michal Klocek Implements minimumMargins...	r1883	#include <QMargins>
Michal Klocek Refactors qchart , adds line animation...	r131
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Refactors internals...	r2273	class ChartItem;
		class AxisItem;
Tero Ahola Renamed QSeries to QAbstractSeries	r988	class QAbstractSeries;
Michal Klocek Refactors qchart , adds line animation...	r131	class ChartDataSet;
Marek Rosa Domains added	r2275	class AbstractDomain;
Michal Klocek Changes QChartAxis -> QAxis	r1006	class ChartAxis;
Michal Klocek Animation refactor...	r530	class ChartAnimator;
Michal Klocek Changes QChartAxis -> QAxis	r1006	class ChartBackground;
Michal Klocek Refactors layout...	r1965	class ChartTitle;
Michal Klocek Refactors axis animation, line animations	r1241	class ChartAnimation;
Michal Klocek Refactors layout managment...	r1534	class ChartLayout;
Michal Klocek Refactors qchart , adds line animation...	r131
		class ChartPresenter: public QObject
		{
		Q_OBJECT
		public:
Tero Ahola Fixed drawing issues in Scatter	r375	enum ZValues {
		BackgroundZValue = -1,
Michal Klocek Fixes mouse handling in base class of chartseries	r1747	ShadesZValue ,
Tero Ahola Fixed drawing issues in Scatter	r375	GridZValue,
Tero Ahola Switched the z-order of axis to be below series...	r1790	AxisZValue,
Tero Ahola All the series to use the same z-plane	r1260	SeriesZValue,
		LineChartZValue = SeriesZValue,
Michal Klocek Fixes mouse handling in base class of chartseries	r1747	SplineChartZValue = SeriesZValue,
Tero Ahola All the series to use the same z-plane	r1260	BarSeriesZValue = SeriesZValue,
		ScatterSeriesZValue = SeriesZValue,
		PieSeriesZValue = SeriesZValue,
Michal Klocek Fixes mouse handling in base class of chartseries	r1747	LegendZValue,
		TopMostZValue
Tero Ahola Fixed drawing issues in Scatter	r375	};
Tero Ahola All the series to use the same z-plane	r1260
		enum State {
		ShowState,
Michal Klocek Refactors axis animation, line animations	r1241	ScrollUpState,
		ScrollDownState,
		ScrollLeftState,
		ScrollRightState,
		ZoomInState,
		ZoomOutState
		};
Michal Klocek Adds ZOrder enum to presenter	r262
Michal Klocek Refactors internals...	r2273	ChartPresenter(QChart *chart);
Michal Klocek Refactors qchart , adds line animation...	r131	virtual ~ChartPresenter();
Michal Klocek Refactored for MVP...	r139
Michal Klocek Refactors internals...	r2273
		void setGeometry(QRectF rect);
		QRectF geometry() const;

		QGraphicsItem *rootItem(){ return m_chart; }
Jani Honkonen src folder: another massive victory for coding style police	r2131	ChartBackground *backgroundElement();
		ChartTitle *titleElement();
		QList<ChartAxis *> axisItems() const;
Michal Klocek Refactors internals...	r2273	QList<ChartItem *> chartItems() const;

		ChartItem* chartElement(QAbstractSeries* series) const;
		ChartAxis* chartElement(QAbstractAxis* axis) const;
Michal Klocek Refactors layout managment...	r1534
Jani Honkonen src folder: another massive victory for coding style police	r2131	QLegend *legend();
Michal Klocek Refactors layout managment...	r1534
Jani Honkonen src folder: another massive victory for coding style police	r2131	void setBackgroundBrush(const QBrush &brush);
Michal Klocek Refactors layout managment...	r1534	QBrush backgroundBrush() const;

Jani Honkonen src folder: another massive victory for coding style police	r2131	void setBackgroundPen(const QPen &pen);
Michal Klocek Refactors layout managment...	r1534	QPen backgroundPen() const;

Jani Honkonen src folder: another massive victory for coding style police	r2131	void setTitle(const QString &title);
Michal Klocek Refactors layout managment...	r1534	QString title() const;

Jani Honkonen src folder: another massive victory for coding style police	r2131	void setTitleFont(const QFont &font);
Michal Klocek Refactors layout managment...	r1534	QFont titleFont() const;

		void setTitleBrush(const QBrush &brush);
		QBrush titleBrush() const;

		void setBackgroundVisible(bool visible);
		bool isBackgroundVisible() const;

		void setBackgroundDropShadowEnabled(bool enabled);
		bool isBackgroundDropShadowEnabled() const;

		void setVisible(bool visible);
Michal Klocek Refactors qchart , adds line animation...	r131
Michal Klocek Adds animation settings handling	r298	void setAnimationOptions(QChart::AnimationOptions options);
		QChart::AnimationOptions animationOptions() const;

Jani Honkonen src folder: another massive victory for coding style police	r2131	void startAnimation(ChartAnimation *animation);
Michal Klocek Refactors internals...	r2273
		//TODO refactor
		void setState(State state,QPointF point);
Michal Klocek Refactors axis animation, line animations	r1241	State state() const { return m_state; }
		QPointF statePoint() const { return m_statePoint; }
Jani Honkonen src folder: another massive victory for coding style police	r2131	ChartLayout *layout();
Michal Klocek Refactors layout managment...	r1534
		private:
		void createBackgroundItem();
		void createTitleItem();
Michal Klocek Refactors qchart , adds line animation...	r131
sauimone Q_SIGNALS and Q_SLOTS	r775	public Q_SLOTS:
Michal Klocek Refactors internals...	r2273	void handleSeriesAdded(QAbstractSeries *series);
Jani Honkonen src folder: another massive victory for coding style police	r2131	void handleSeriesRemoved(QAbstractSeries *series);
Michal Klocek Refactors internals...	r2273	void handleAxisAdded(QAbstractAxis *axis);
Jani Honkonen src folder: another massive victory for coding style police	r2131	void handleAxisRemoved(QAbstractAxis *axis);
Michal Klocek Refactor domain model...	r439
Michal Klocek Refactors axis animation, line animations	r1241	private Q_SLOTS:
		void handleAnimationFinished();

sauimone Q_SIGNALS and Q_SLOTS	r775	Q_SIGNALS:
Michal Klocek Refactors axis animation, line animations	r1241	void animationsFinished();
Michal Klocek Refactor qledgend handling...	r855
Michal Klocek Refactors qchart , adds line animation...	r131	private:
Jani Honkonen src folder: another massive victory for coding style police	r2131	QChart *m_chart;
Michal Klocek Refactors internals...	r2273	QList<ChartItem *> m_chartItems;
		QList<ChartAxis *> m_axisItems;
		QList<QAbstractSeries *> m_series;
		QList<QAbstractAxis *> m_axes;
Michal Klocek Adds animation settings handling	r298	QChart::AnimationOptions m_options;
Michal Klocek Refactors axis animation, line animations	r1241	State m_state;
		QPointF m_statePoint;
Jani Honkonen src folder: another massive victory for coding style police	r2131	QList<ChartAnimation *> m_animations;
		ChartLayout *m_layout;
		ChartBackground *m_background;
		ChartTitle *m_title;
Michal Klocek Refactors internals...	r2273	QRectF m_rect;
Michal Klocek Refactors qchart , adds line animation...	r131	};

		QTCOMMERCIALCHART_END_NAMESPACE

Jani Honkonen Fix Krazy issues	r1935	#endif /* CHARTPRESENTER_H */