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

get rid of some declarative warnings

Michal Klocek - - Load All Authors

File last commit:

r1197:9dfce0b917b8


                r1233:9696753107ba

Download file

             declarativechart.h
        
                    89 lines
            
             | 3.0 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>

        Tero Ahola
    
Draft for QML demo that shows weather forecasts

              r1139
            
      #include <QAxis>

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

              r120
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Tero Ahola
    
Enabled animations on QML

              r885
            
      // TODO: Derive from QChart for easier definition of properties?

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

              r120
            
      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
    
QML api to use chart theme enum of QChart

              r836
            
          Q_PROPERTY(QChart::ChartTheme theme READ theme WRITE setTheme)

        Tero Ahola
    
Added animation configuration to QML chart api

              r1094
            
          Q_PROPERTY(QChart::AnimationOption animationOptions READ animationOptions WRITE setAnimationOptions)

        Tero Ahola
    
QML test app's scatter and area into separate views

              r918
            
          Q_PROPERTY(QString title READ title WRITE setTitle)

        Tero Ahola
    
Legend to QML API

              r1095
            
          Q_PROPERTY(ChartLegend legend READ legend WRITE setLegend)

        Tero Ahola
    
Draft for QML demo that shows weather forecasts

              r1139
            
          Q_PROPERTY(QAxis *axisX READ axisX)

          Q_PROPERTY(QAxis *axisY READ axisY)

        Tero Ahola
    
Initial support for x-axis labels in QML api

              r1157
            
          // TODO: how to define axis labels? This is not very convenient

          Q_PROPERTY(QVariantList axisXLabels READ axisXLabels WRITE setAxisXLabels)

        Tero Ahola
    
Legend to QML API

              r1095
            
          Q_ENUMS(ChartLegend)

      public:

          enum ChartLegend {

              LegendDisabled = 0,

              LegendTop,

              LegendBottom,

              LegendLeft,

              LegendRight

          };

        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 api to use chart theme enum of QChart

              r836
            
          void setTheme(QChart::ChartTheme theme) {m_chart->setTheme(theme);}

        Tero Ahola
    
Added animation configuration to QML chart api

              r1094
            
          QChart::ChartTheme theme() {return m_chart->theme();}

          void setAnimationOptions(QChart::AnimationOption animations);

          QChart::AnimationOption animationOptions();

        Tero Ahola
    
QML test app's scatter and area into separate views

              r918
            
          void setTitle(QString title) {m_chart->setTitle(title);}

          QString title() { return m_chart->title();}

        Tero Ahola
    
Legend to QML API

              r1095
            
          void setLegend(ChartLegend legend);

          ChartLegend legend();

        Tero Ahola
    
Draft for QML demo that shows weather forecasts

              r1139
            
          QAxis *axisX();

          QAxis *axisY();

        Tero Ahola
    
Initial support for x-axis labels in QML api

              r1157
            
          QVariantList axisXLabels();

          void setAxisXLabels(QVariantList list);

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

              r120
            
      public:

          // 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
    
Legend to QML API

              r1095
            
          ChartLegend m_legend;

        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>
Tero Ahola Draft for QML demo that shows weather forecasts	r1139	#include <QAxis>
Tero Ahola Proof-of-concept for QML api...	r120
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Tero Ahola Enabled animations on QML	r885	// TODO: Derive from QChart for easier definition of properties?
Tero Ahola Proof-of-concept for QML api...	r120	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 QML api to use chart theme enum of QChart	r836	Q_PROPERTY(QChart::ChartTheme theme READ theme WRITE setTheme)
Tero Ahola Added animation configuration to QML chart api	r1094	Q_PROPERTY(QChart::AnimationOption animationOptions READ animationOptions WRITE setAnimationOptions)
Tero Ahola QML test app's scatter and area into separate views	r918	Q_PROPERTY(QString title READ title WRITE setTitle)
Tero Ahola Legend to QML API	r1095	Q_PROPERTY(ChartLegend legend READ legend WRITE setLegend)
Tero Ahola Draft for QML demo that shows weather forecasts	r1139	Q_PROPERTY(QAxis *axisX READ axisX)
		Q_PROPERTY(QAxis *axisY READ axisY)
Tero Ahola Initial support for x-axis labels in QML api	r1157	// TODO: how to define axis labels? This is not very convenient
		Q_PROPERTY(QVariantList axisXLabels READ axisXLabels WRITE setAxisXLabels)
Tero Ahola Legend to QML API	r1095	Q_ENUMS(ChartLegend)

		public:
		enum ChartLegend {
		LegendDisabled = 0,
		LegendTop,
		LegendBottom,
		LegendLeft,
		LegendRight
		};
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 api to use chart theme enum of QChart	r836	void setTheme(QChart::ChartTheme theme) {m_chart->setTheme(theme);}
Tero Ahola Added animation configuration to QML chart api	r1094	QChart::ChartTheme theme() {return m_chart->theme();}
		void setAnimationOptions(QChart::AnimationOption animations);
		QChart::AnimationOption animationOptions();
Tero Ahola QML test app's scatter and area into separate views	r918	void setTitle(QString title) {m_chart->setTitle(title);}
		QString title() { return m_chart->title();}
Tero Ahola Legend to QML API	r1095	void setLegend(ChartLegend legend);
		ChartLegend legend();
Tero Ahola Draft for QML demo that shows weather forecasts	r1139	QAxis *axisX();
		QAxis *axisY();
Tero Ahola Initial support for x-axis labels in QML api	r1157	QVariantList axisXLabels();
		void setAxisXLabels(QVariantList list);
Tero Ahola Proof-of-concept for QML api...	r120
		public:
		// 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 Legend to QML API	r1095	ChartLegend m_legend;
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