HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/chartsqml2/declarativesplineseries.cpp

Added mapToXxx methods to ChartView...

Added mapToXxx methods to ChartView Added mapToPosition and mapToValue methods to ChartView. These correspond to the ones QChart has. Change-Id: I5d0477d3f704b6f56243b31848d175fd17f24ff6 Task-number: QTRD-3494 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2786:956ee548c718

Download file

             declarativesplineseries.cpp
        
                    102 lines
            
             | 3.1 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativesplineseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add/modify license headers

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

      **

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** Copyright (C) 2015 The Qt Company Ltd

        Jani Honkonen
    
Add/modify license headers

              r830
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** For any questions to The Qt Company, please use contact form at http://qt.io

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** Licensees holding valid commercial license for Qt may use this file in

      ** accordance with the Qt License Agreement provided with the Software

      ** or, alternatively, in accordance with the terms contained in a written

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** agreement between you and The Qt Company.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

      ** If you have questions regarding the use of this file, please use

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** contact form at http://qt.io

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

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

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      #include "declarativesplineseries.h"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) :

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QSplineSeries(parent),

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          m_axes(new DeclarativeAxes(this))

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      {

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisXChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisYChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SIGNAL(axisXTopChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis*)), this, SIGNAL(axisYRightChanged(QAbstractAxis*)));

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisAngularChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
          connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));

          connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      }

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
      void DeclarativeSplineSeries::handleCountChanged(int index)

      {

          Q_UNUSED(index)

          emit countChanged(points().count());

      }

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
      qreal DeclarativeSplineSeries::width() const

      {

          return pen().widthF();

      }

      void DeclarativeSplineSeries::setWidth(qreal width)

      {

          if (width != pen().widthF()) {

              QPen p = pen();

              p.setWidthF(width);

              setPen(p);

              emit widthChanged(width);

          }

      }

      Qt::PenStyle DeclarativeSplineSeries::style() const

      {

          return pen().style();

      }

      void DeclarativeSplineSeries::setStyle(Qt::PenStyle style)

      {

          if (style != pen().style()) {

              QPen p = pen();

              p.setStyle(style);

              setPen(p);

              emit styleChanged(style);

          }

      }

      Qt::PenCapStyle DeclarativeSplineSeries::capStyle() const

      {

          return pen().capStyle();

      }

      void DeclarativeSplineSeries::setCapStyle(Qt::PenCapStyle capStyle)

      {

          if (capStyle != pen().capStyle()) {

              QPen p = pen();

              p.setCapStyle(capStyle);

              setPen(p);

              emit capStyleChanged(capStyle);

          }

      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QQmlListProperty<QObject> DeclarativeSplineSeries::declarativeChildren()

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
      {

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          return QQmlListProperty<QObject>(this, 0, &appendDeclarativeChildren ,0,0,0);

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      void DeclarativeSplineSeries::appendDeclarativeChildren(QQmlListProperty<QObject> *list, QObject *element)

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
      {

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
          Q_UNUSED(list)

          Q_UNUSED(element)

        Jani Honkonen
    
Fix spelling errors

              r1940
            
          // Empty implementation, children are parsed in componentComplete

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
      }

        Tero Ahola
    
Cleaning up declarative implementation

              r1211
            
        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      #include "moc_declarativesplineseries.cpp"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

	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	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Jani Honkonen Add/modify license headers	r830	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Jani Honkonen Add/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Jani Honkonen Add/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2740	** Licensees holding valid commercial license for Qt may use this file in
		** accordance with the Qt License Agreement provided with the Software
		** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala Copyright header changes...	r2776	** agreement between you and The Qt Company.
Jani Honkonen Add/modify license headers	r830	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Jani Honkonen Add/modify license headers	r830	**
		****************************************************************************/

Tero Ahola Declarative series classed now derived from QSeries childs	r789	#include "declarativesplineseries.h"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Declarative series classed now derived from QSeries childs	r789
		DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) :
Tero Ahola Refactored QML axis handling	r1813	QSplineSeries(parent),
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	m_axes(new DeclarativeAxes(this))
Tero Ahola Declarative series classed now derived from QSeries childs	r789	{
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis)), this, SIGNAL(axisXChanged(QAbstractAxis)));
		connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis)), this, SIGNAL(axisYChanged(QAbstractAxis)));
		connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis)), this, SIGNAL(axisXTopChanged(QAbstractAxis)));
		connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis)), this, SIGNAL(axisYRightChanged(QAbstractAxis)));
Miikka Heikkinen Add Polar chart support...	r2483	connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis)), this, SIGNAL(axisAngularChanged(QAbstractAxis)));
		connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis)), this, SIGNAL(axisRadialChanged(QAbstractAxis)));
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
		connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
Tero Ahola Declarative series classed now derived from QSeries childs	r789	}

Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	void DeclarativeSplineSeries::handleCountChanged(int index)
		{
		Q_UNUSED(index)
		emit countChanged(points().count());
		}

Tero Ahola Adding missing QML series API line/border properties	r1904	qreal DeclarativeSplineSeries::width() const
		{
		return pen().widthF();
		}

		void DeclarativeSplineSeries::setWidth(qreal width)
		{
		if (width != pen().widthF()) {
		QPen p = pen();
		p.setWidthF(width);
		setPen(p);
		emit widthChanged(width);
		}
		}

		Qt::PenStyle DeclarativeSplineSeries::style() const
		{
		return pen().style();
		}

		void DeclarativeSplineSeries::setStyle(Qt::PenStyle style)
		{
		if (style != pen().style()) {
		QPen p = pen();
		p.setStyle(style);
		setPen(p);
		emit styleChanged(style);
		}
		}

		Qt::PenCapStyle DeclarativeSplineSeries::capStyle() const
		{
		return pen().capStyle();
		}

		void DeclarativeSplineSeries::setCapStyle(Qt::PenCapStyle capStyle)
		{
		if (capStyle != pen().capStyle()) {
		QPen p = pen();
		p.setCapStyle(capStyle);
		setPen(p);
		emit capStyleChanged(capStyle);
		}
		}

Titta Heikkala Qt Charts project file structure change...	r2712	QQmlListProperty<QObject> DeclarativeSplineSeries::declarativeChildren()
Tero Ahola Separated series model stuff from data api in QML examples	r1202	{
Titta Heikkala Qt Charts project file structure change...	r2712	return QQmlListProperty<QObject>(this, 0, &appendDeclarativeChildren ,0,0,0);
Tero Ahola Separated series model stuff from data api in QML examples	r1202	}

Titta Heikkala Qt Charts project file structure change...	r2712	void DeclarativeSplineSeries::appendDeclarativeChildren(QQmlListProperty<QObject> list, QObject element)
Tero Ahola Separated series model stuff from data api in QML examples	r1202	{
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	Q_UNUSED(list)
		Q_UNUSED(element)
Jani Honkonen Fix spelling errors	r1940	// Empty implementation, children are parsed in componentComplete
Tero Ahola Separated series model stuff from data api in QML examples	r1202	}
Tero Ahola Cleaning up declarative implementation	r1211
Tero Ahola Declarative series classed now derived from QSeries childs	r789	#include "moc_declarativesplineseries.cpp"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE