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

Merge remote-tracking branch 'origin/5.6' into 5.7...

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2893:0464d42b101e

5.7.0

Download file

             declarativelineseries.cpp
        
                    114 lines
            
             | 3.8 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativelineseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** and conditions see https://www.qt.io/terms-conditions. For further

      ** information use the contact form at https://www.qt.io/contact-us.

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Jani Honkonen
    
Add/modify license headers

              r830
            
        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      #include "declarativelineseries.h"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) :

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QLineSeries(parent),

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          m_axes(new DeclarativeAxes(this))

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      {

        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)));

        Miikka Heikkinen
    
Add a method to remove more than one point to QXYSeries...

              r2805
            
          connect(this, SIGNAL(pointsRemoved(int, int)), this, SLOT(handleCountChanged(int)));

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      }

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

              r1465
            
      void DeclarativeLineSeries::handleCountChanged(int index)

      {

          Q_UNUSED(index)

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

      }

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
      qreal DeclarativeLineSeries::width() const

      {

          return pen().widthF();

      }

      void DeclarativeLineSeries::setWidth(qreal width)

      {

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

              QPen p = pen();

              p.setWidthF(width);

              setPen(p);

              emit widthChanged(width);

          }

      }

      Qt::PenStyle DeclarativeLineSeries::style() const

      {

          return pen().style();

      }

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

      {

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

              QPen p = pen();

              p.setStyle(style);

              setPen(p);

              emit styleChanged(style);

          }

      }

      Qt::PenCapStyle DeclarativeLineSeries::capStyle() const

      {

          return pen().capStyle();

      }

      void DeclarativeLineSeries::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> DeclarativeLineSeries::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 DeclarativeLineSeries::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
    
Dynamic data for QML pie and line series

              r215
            
      #include "moc_declarativelineseries.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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Jani Honkonen Add/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Jani Honkonen Add/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add/modify license headers	r830
Tero Ahola Dynamic data for QML pie and line series	r215	#include "declarativelineseries.h"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Dynamic data for QML pie and line series	r215
Tero Ahola Declarative series classed now derived from QSeries childs	r789	DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) :
Tero Ahola Refactored QML axis handling	r1813	QLineSeries(parent),
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	m_axes(new DeclarativeAxes(this))
Tero Ahola Dynamic data for QML pie and line series	r215	{
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)));
Miikka Heikkinen Add a method to remove more than one point to QXYSeries...	r2805	connect(this, SIGNAL(pointsRemoved(int, int)), this, SLOT(handleCountChanged(int)));
Tero Ahola Dynamic data for QML pie and line series	r215	}

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

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

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

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

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

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

		void DeclarativeLineSeries::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> DeclarativeLineSeries::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 DeclarativeLineSeries::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 Dynamic data for QML pie and line series	r215	#include "moc_declarativelineseries.cpp"

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