HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · plugins/declarative/declarativechart.h

Bugfix area chart not drawn after drawLine change in lineseries

Tero Ahola - - Load All Authors

File last commit:

r1813:c3705e59ed40


                r1827:f8179c45a147

Download file

             declarativechart.h
        
                    159 lines
            
             | 5.6 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / plugins / declarative / declarativechart.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add/modify license headers

              r830
            
      /****************************************************************************

      **

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

      **

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

        Jani Honkonen
    
First draft of project structure

              r1
            
      #ifndef DECLARATIVECHART_H

      #define DECLARATIVECHART_H

      #include <QtCore/QtGlobal>

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      #include <QDeclarativeItem>

      #include <qchart.h>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      class DeclarativeChart : public QDeclarativeItem

      // TODO: for QTQUICK2: extend QQuickPainterItem instead

      //class DeclarativeChart : public QQuickPaintedItem, public Chart

        Jani Honkonen
    
First draft of project structure

              r1
            
      {

          Q_OBJECT

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

              r1481
            
          Q_PROPERTY(Theme theme READ theme WRITE setTheme)

          Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)

          Q_PROPERTY(QString title READ title WRITE setTitle)

        Jani Honkonen
    
Add qml Font properties & docs

              r1517
            
          Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)

        Tero Ahola
    
QML ChartView scrolling, zooming, drop shadow

              r1461
            
          Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)

        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
          Q_PROPERTY(QLegend *legend READ legend)

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
          Q_PROPERTY(int count READ count)

        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
          Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)

        Tero Ahola
    
QML ChartView scrolling, zooming, drop shadow

              r1461
            
          Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)

        Tero Ahola
    
Added property definitions to QChart

              r1524
            
          Q_PROPERTY(qreal topMargin READ topMargin NOTIFY topMarginChanged)

          Q_PROPERTY(qreal bottomMargin READ bottomMargin NOTIFY bottomMarginChanged)

          Q_PROPERTY(qreal leftMargin READ leftMargin NOTIFY leftMarginChanged)

          Q_PROPERTY(qreal rightMargin READ rightMargin NOTIFY rightMarginChanged)

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
          Q_ENUMS(Animation)

          Q_ENUMS(Theme)

          Q_ENUMS(SeriesType)

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      //    Q_ENUMS(AxisType)

        Tero Ahola
    
Legend to QML API

              r1095
            
      public:

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
          // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api

          enum Theme {

              ChartThemeLight = 0,

              ChartThemeBlueCerulean,

              ChartThemeDark,

              ChartThemeBrownSand,

              ChartThemeBlueNcs,

              ChartThemeHighContrast,

              ChartThemeBlueIcy

          };

          enum Animation {

              NoAnimation = 0x0,

              GridAxisAnimations = 0x1,

              SeriesAnimations =0x2,

              AllAnimations = 0x3

          };

          enum SeriesType {

              SeriesTypeLine,

              SeriesTypeArea,

              SeriesTypeBar,

              SeriesTypeStackedBar,

              SeriesTypePercentBar,

              SeriesTypePie,

              SeriesTypeScatter,

        sauimone
    
added horizontal barcharts to qmlchart demo

              r1811
            
              SeriesTypeSpline,

              SeriesTypeHorizontalBar,

              SeriesTypeHorizontalStackedBar,

              SeriesTypeHorizontalPercentBar

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
          };

        Jani Honkonen
    
First draft of project structure

              r1
            
      public:

          DeclarativeChart(QDeclarativeItem *parent = 0);

        Tero Ahola
    
d

              r722
            
          ~DeclarativeChart();

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      public: // From QDeclarativeItem/QGraphicsItem

        Tero Ahola
    
Simplified declarative implementation

              r1117
            
          void childEvent(QChildEvent *event);

          void componentComplete();

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
          void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);

        Tero Ahola
    
Added QML api for bar series

              r646
            
          void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      public:

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
          void setTheme(DeclarativeChart::Theme theme);

          DeclarativeChart::Theme theme();

          void setAnimationOptions(DeclarativeChart::Animation animations);

          DeclarativeChart::Animation animationOptions();

        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
          void setTitle(QString title);

          QString title();

          QLegend *legend();

        Jani Honkonen
    
Add qml Font properties & docs

              r1517
            
          QFont titleFont() const;

          void setTitleFont(const QFont& font);

        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
          void setTitleColor(QColor color);

          QColor titleColor();

          void setBackgroundColor(QColor color);

          QColor backgroundColor();

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
          int count();

        Tero Ahola
    
QML ChartView scrolling, zooming, drop shadow

              r1461
            
          void setDropShadowEnabled(bool enabled);

          bool dropShadowEnabled();

        Tero Ahola
    
Added property definitions to QChart

              r1524
            
          qreal topMargin();

          qreal bottomMargin();

          qreal leftMargin();

          qreal rightMargin();

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          void createDefaultAxes(QAbstractSeries* series);

        Michal Klocek
    
Adds axis to qml...

              r1604
            
        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      public:

          Q_INVOKABLE QAbstractSeries *series(int index);

          Q_INVOKABLE QAbstractSeries *series(QString seriesName);

          Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);

          Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);

        Michal Klocek
    
Adds axis to qml...

              r1604
            
          Q_INVOKABLE void createDefaultAxes();

        Michal Klocek
    
Fixes missing update barcategory...

              r1643
            
          Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);

          Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);

        Michal Klocek
    
Adds axis to qml...

              r1604
            
        Tero Ahola
    
QML ChartView scrolling, zooming, drop shadow

              r1461
            
          Q_INVOKABLE void zoom(qreal factor);

          Q_INVOKABLE void scrollLeft(qreal pixels);

          Q_INVOKABLE void scrollRight(qreal pixels);

          Q_INVOKABLE void scrollUp(qreal pixels);

          Q_INVOKABLE void scrollDown(qreal pixels);

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
      Q_SIGNALS:

          void axisLabelsChanged();

        Tero Ahola
    
Added property definitions to QChart

              r1524
            
          void titleColorChanged(QColor color);

        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
          void backgroundColorChanged();

        Tero Ahola
    
QML ChartView scrolling, zooming, drop shadow

              r1461
            
          void dropShadowEnabledChanged(bool enabled);

        Tero Ahola
    
Added property definitions to QChart

              r1524
            
          void topMarginChanged(qreal margin);

          void bottomMarginChanged(qreal margin);

          void leftMarginChanged(qreal margin);

          void rightMarginChanged(qreal margin);

        Tero Ahola
    
Qml ChartView properties; legend to use Qt alignments

              r1357
            
        Tero Ahola
    
Added property definitions to QChart

              r1524
            
      public Q_SLOTS:

          void handleMarginsChanged(QRectF newMargins);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          void handleAxisXSet(QAbstractAxis *axis);

          void handleAxisYSet(QAbstractAxis *axis);

        Tero Ahola
    
Added property definitions to QChart

              r1524
            
      private:

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
          // Extending QChart with DeclarativeChart is not possible because QObject does not support

          // multi inheritance, so we now have a QChart as a member instead

          QChart *m_chart;

        Tero Ahola
    
Added property definitions to QChart

              r1524
            
          QRectF m_chartMargins;

        Jani Honkonen
    
First draft of project structure

              r1
            
      };

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      QTCOMMERCIALCHART_END_NAMESPACE

        Jani Honkonen
    
First draft of project structure

              r1
            
      #endif // DECLARATIVECHART_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/modify license headers	r830	/****************************************************************************
		**
		** 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$
		**
		****************************************************************************/

Jani Honkonen First draft of project structure	r1	#ifndef DECLARATIVECHART_H
		#define DECLARATIVECHART_H

		#include <QtCore/QtGlobal>
Tero Ahola Proof-of-concept for QML api...	r120	#include <QDeclarativeItem>
		#include <qchart.h>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		class DeclarativeChart : public QDeclarativeItem
		// TODO: for QTQUICK2: extend QQuickPainterItem instead
		//class DeclarativeChart : public QQuickPaintedItem, public Chart
Jani Honkonen First draft of project structure	r1	{
		Q_OBJECT
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	Q_PROPERTY(Theme theme READ theme WRITE setTheme)
		Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
		Q_PROPERTY(QString title READ title WRITE setTitle)
Jani Honkonen Add qml Font properties & docs	r1517	Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
Tero Ahola QML ChartView scrolling, zooming, drop shadow	r1461	Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357	Q_PROPERTY(QLegend *legend READ legend)
Tero Ahola QML demo with dynamic data	r1240	Q_PROPERTY(int count READ count)
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357	Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
Tero Ahola QML ChartView scrolling, zooming, drop shadow	r1461	Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
Tero Ahola Added property definitions to QChart	r1524	Q_PROPERTY(qreal topMargin READ topMargin NOTIFY topMarginChanged)
		Q_PROPERTY(qreal bottomMargin READ bottomMargin NOTIFY bottomMarginChanged)
		Q_PROPERTY(qreal leftMargin READ leftMargin NOTIFY leftMarginChanged)
		Q_PROPERTY(qreal rightMargin READ rightMargin NOTIFY rightMarginChanged)
Tero Ahola QML demo with dynamic data	r1240	Q_ENUMS(Animation)
		Q_ENUMS(Theme)
		Q_ENUMS(SeriesType)
Tero Ahola Refactored QML axis handling	r1813	// Q_ENUMS(AxisType)
Tero Ahola Legend to QML API	r1095
		public:
Tero Ahola QML demo with dynamic data	r1240	// duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
		enum Theme {
		ChartThemeLight = 0,
		ChartThemeBlueCerulean,
		ChartThemeDark,
		ChartThemeBrownSand,
		ChartThemeBlueNcs,
		ChartThemeHighContrast,
		ChartThemeBlueIcy
		};

		enum Animation {
		NoAnimation = 0x0,
		GridAxisAnimations = 0x1,
		SeriesAnimations =0x2,
		AllAnimations = 0x3
		};

		enum SeriesType {
		SeriesTypeLine,
		SeriesTypeArea,
		SeriesTypeBar,
		SeriesTypeStackedBar,
		SeriesTypePercentBar,
		SeriesTypePie,
		SeriesTypeScatter,
sauimone added horizontal barcharts to qmlchart demo	r1811	SeriesTypeSpline,
		SeriesTypeHorizontalBar,
		SeriesTypeHorizontalStackedBar,
		SeriesTypeHorizontalPercentBar
Tero Ahola QML demo with dynamic data	r1240	};

Jani Honkonen First draft of project structure	r1	public:
		DeclarativeChart(QDeclarativeItem *parent = 0);
Tero Ahola d	r722	~DeclarativeChart();
Tero Ahola Proof-of-concept for QML api...	r120
		public: // From QDeclarativeItem/QGraphicsItem
Tero Ahola Simplified declarative implementation	r1117	void childEvent(QChildEvent *event);
		void componentComplete();
Tero Ahola Proof-of-concept for QML api...	r120	void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
Tero Ahola Added QML api for bar series	r646	void paint (QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget = 0);
Tero Ahola Proof-of-concept for QML api...	r120
		public:
Tero Ahola QML demo with dynamic data	r1240	void setTheme(DeclarativeChart::Theme theme);
		DeclarativeChart::Theme theme();
		void setAnimationOptions(DeclarativeChart::Animation animations);
		DeclarativeChart::Animation animationOptions();
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357	void setTitle(QString title);
		QString title();
		QLegend *legend();
Jani Honkonen Add qml Font properties & docs	r1517	QFont titleFont() const;
		void setTitleFont(const QFont& font);
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357	void setTitleColor(QColor color);
		QColor titleColor();
		void setBackgroundColor(QColor color);
		QColor backgroundColor();
Tero Ahola QML demo with dynamic data	r1240	int count();
Tero Ahola QML ChartView scrolling, zooming, drop shadow	r1461	void setDropShadowEnabled(bool enabled);
		bool dropShadowEnabled();
Tero Ahola Added property definitions to QChart	r1524	qreal topMargin();
		qreal bottomMargin();
		qreal leftMargin();
		qreal rightMargin();
Tero Ahola Refactored QML axis handling	r1813	void createDefaultAxes(QAbstractSeries* series);
Michal Klocek Adds axis to qml...	r1604
Tero Ahola QML methods of series: several fixes and documentation	r1521	public:
		Q_INVOKABLE QAbstractSeries *series(int index);
		Q_INVOKABLE QAbstractSeries *series(QString seriesName);
		Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
Tero Ahola Refactored QML axis handling	r1813	Q_INVOKABLE void setAxisX(QAbstractAxis axis, QAbstractSeries series = 0);
		Q_INVOKABLE void setAxisY(QAbstractAxis axis, QAbstractSeries series = 0);
Michal Klocek Adds axis to qml...	r1604	Q_INVOKABLE void createDefaultAxes();
Michal Klocek Fixes missing update barcategory...	r1643	Q_INVOKABLE QAbstractAxis axisX(QAbstractSeries series = 0);
		Q_INVOKABLE QAbstractAxis axisY(QAbstractSeries series = 0);
Michal Klocek Adds axis to qml...	r1604
Tero Ahola QML ChartView scrolling, zooming, drop shadow	r1461	Q_INVOKABLE void zoom(qreal factor);
		Q_INVOKABLE void scrollLeft(qreal pixels);
		Q_INVOKABLE void scrollRight(qreal pixels);
		Q_INVOKABLE void scrollUp(qreal pixels);
		Q_INVOKABLE void scrollDown(qreal pixels);
Tero Ahola Proof-of-concept for QML api...	r120
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357	Q_SIGNALS:
		void axisLabelsChanged();
Tero Ahola Added property definitions to QChart	r1524	void titleColorChanged(QColor color);
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357	void backgroundColorChanged();
Tero Ahola QML ChartView scrolling, zooming, drop shadow	r1461	void dropShadowEnabledChanged(bool enabled);
Tero Ahola Added property definitions to QChart	r1524	void topMarginChanged(qreal margin);
		void bottomMarginChanged(qreal margin);
		void leftMarginChanged(qreal margin);
		void rightMarginChanged(qreal margin);
Tero Ahola Qml ChartView properties; legend to use Qt alignments	r1357
Tero Ahola Added property definitions to QChart	r1524	public Q_SLOTS:
		void handleMarginsChanged(QRectF newMargins);
Tero Ahola Refactored QML axis handling	r1813	void handleAxisXSet(QAbstractAxis *axis);
		void handleAxisYSet(QAbstractAxis *axis);
Tero Ahola Added property definitions to QChart	r1524
		private:
Tero Ahola Proof-of-concept for QML api...	r120	// Extending QChart with DeclarativeChart is not possible because QObject does not support
		// multi inheritance, so we now have a QChart as a member instead
		QChart *m_chart;
Tero Ahola Added property definitions to QChart	r1524	QRectF m_chartMargins;
Jani Honkonen First draft of project structure	r1	};

Tero Ahola Proof-of-concept for QML api...	r120	QTCOMMERCIALCHART_END_NAMESPACE
Jani Honkonen First draft of project structure	r1
		#endif // DECLARATIVECHART_H