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

Fix version numbers...

Fix version numbers QML API version was only updated to what it actually is, it doesn't need to follow the module version. Change-Id: I5c26da72b03a1e6858327a8a08f933998991c39e Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2858:18b5962194a7

Download file

             declarativescatterseries.cpp
        
                    124 lines
            
             | 4.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativescatterseries.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
    
Proposal for QML data API

              r196
            
      #include "declarativescatterseries.h"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Proposal for QML data API

              r196
            
        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QScatterSeries(parent),

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          m_axes(new DeclarativeAxes(this))

        Tero Ahola
    
Proposal for QML data API

              r196
            
      {

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

        Titta Heikkala
    
Add possibility to set brush image via QML API...

              r2681
            
          connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));

        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 DeclarativeScatterSeries::handleCountChanged(int index)

      {

          Q_UNUSED(index)

          emit countChanged(QScatterSeries::count());

      }

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
      qreal DeclarativeScatterSeries::borderWidth() const

      {

          return pen().widthF();

      }

      void DeclarativeScatterSeries::setBorderWidth(qreal width)

      {

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

              QPen p = pen();

              p.setWidthF(width);

              setPen(p);

              emit borderWidthChanged(width);

          }

      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QQmlListProperty<QObject> DeclarativeScatterSeries::declarativeChildren()

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      {

        Titta Heikkala
    
Qt Charts project file structure change...

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

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      }

        Titta Heikkala
    
Qt Charts project file structure change...

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

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      {

        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
    
QML and static data in pie and xy series

              r1186
            
      }

        Titta Heikkala
    
Add possibility to set brush image via QML API...

              r2681
            
      QString DeclarativeScatterSeries::brushFilename() const

      {

          return m_brushFilename;

      }

      void DeclarativeScatterSeries::setBrushFilename(const QString &brushFilename)

      {

          QImage brushImage(brushFilename);

          if (QScatterSeries::brush().textureImage() != brushImage) {

              QBrush brush = QScatterSeries::brush();

              brush.setTextureImage(brushImage);

              QScatterSeries::setBrush(brush);

              m_brushFilename = brushFilename;

              m_brushImage = brushImage;

              emit brushFilenameChanged(brushFilename);

          }

      }

      void DeclarativeScatterSeries::setBrush(const QBrush &brush)

      {

          QScatterSeries::setBrush(brush);

          emit brushChanged();

      }

      QBrush DeclarativeScatterSeries::brush() const

      {

          return QScatterSeries::brush();

      }

      void DeclarativeScatterSeries::handleBrushChanged()

      {

          // If the texture image of the brush has changed along the brush

          // the brush file name needs to be cleared.

          if (!m_brushFilename.isEmpty() && QScatterSeries::brush().textureImage() != m_brushImage) {

              m_brushFilename.clear();

              emit brushFilenameChanged(QString(""));

          }

      }

        Tero Ahola
    
Proposal for QML data API

              r196
            
      #include "moc_declarativescatterseries.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 Proposal for QML data API	r196	#include "declarativescatterseries.h"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Proposal for QML data API	r196
Tero Ahola Declarative series classed now derived from QSeries childs	r789	DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :
Tero Ahola Refactored QML axis handling	r1813	QScatterSeries(parent),
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	m_axes(new DeclarativeAxes(this))
Tero Ahola Proposal for QML data API	r196	{
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)));
Titta Heikkala Add possibility to set brush image via QML API...	r2681	connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
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 DeclarativeScatterSeries::handleCountChanged(int index)
		{
		Q_UNUSED(index)
		emit countChanged(QScatterSeries::count());
		}

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

		void DeclarativeScatterSeries::setBorderWidth(qreal width)
		{
		if (width != pen().widthF()) {
		QPen p = pen();
		p.setWidthF(width);
		setPen(p);
		emit borderWidthChanged(width);
		}
		}

Titta Heikkala Qt Charts project file structure change...	r2712	QQmlListProperty<QObject> DeclarativeScatterSeries::declarativeChildren()
Tero Ahola QML and static data in pie and xy series	r1186	{
Titta Heikkala Qt Charts project file structure change...	r2712	return QQmlListProperty<QObject>(this, 0, &appendDeclarativeChildren ,0,0,0);
Tero Ahola QML and static data in pie and xy series	r1186	}

Titta Heikkala Qt Charts project file structure change...	r2712	void DeclarativeScatterSeries::appendDeclarativeChildren(QQmlListProperty<QObject> list, QObject element)
Tero Ahola QML and static data in pie and xy series	r1186	{
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 QML and static data in pie and xy series	r1186	}

Titta Heikkala Add possibility to set brush image via QML API...	r2681	QString DeclarativeScatterSeries::brushFilename() const
		{
		return m_brushFilename;
		}

		void DeclarativeScatterSeries::setBrushFilename(const QString &brushFilename)
		{
		QImage brushImage(brushFilename);
		if (QScatterSeries::brush().textureImage() != brushImage) {
		QBrush brush = QScatterSeries::brush();
		brush.setTextureImage(brushImage);
		QScatterSeries::setBrush(brush);
		m_brushFilename = brushFilename;
		m_brushImage = brushImage;
		emit brushFilenameChanged(brushFilename);
		}
		}

		void DeclarativeScatterSeries::setBrush(const QBrush &brush)
		{
		QScatterSeries::setBrush(brush);
		emit brushChanged();
		}

		QBrush DeclarativeScatterSeries::brush() const
		{
		return QScatterSeries::brush();
		}

		void DeclarativeScatterSeries::handleBrushChanged()
		{
		// If the texture image of the brush has changed along the brush
		// the brush file name needs to be cleared.
		if (!m_brushFilename.isEmpty() && QScatterSeries::brush().textureImage() != m_brushImage) {
		m_brushFilename.clear();
		emit brushFilenameChanged(QString(""));
		}
		}

Tero Ahola Proposal for QML data API	r196	#include "moc_declarativescatterseries.cpp"

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