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

Fix designer plugin target...

Fix designer plugin target The distinction between release and debug dlls for the Charts designer plugin is done by adding 'd' to the dll name for debug version. Change-Id: I7f3a52c94360889452e28a639fadab53b784ce60 Task-number: QTRD-1846 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2712:c544258484ff


                r2722:82abd640acc7

Download file

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

        Jani Honkonen
    
Add/modify license headers

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

      **

        Titta Heikkala
    
Update copyright year...

              r2688
            
      ** Copyright (C) 2014 Digia Plc

        Jani Honkonen
    
Add/modify license headers

              r830
            
      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** This file is part of the Qt Enterprise Charts Add-on.

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

      ** $QT_BEGIN_LICENSE$

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** Licensees holding valid Qt Enterprise licenses may use this file in

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

        Jani Honkonen
    
Add/modify license headers

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

      **

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

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

        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

Jani Honkonen Add/modify license headers	r830	/****************************************************************************
		**
Titta Heikkala Update copyright year...	r2688	** Copyright (C) 2014 Digia Plc
Jani Honkonen Add/modify license headers	r830	** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** This file is part of the Qt Enterprise Charts Add-on.
Jani Honkonen Add/modify license headers	r830	**
		** $QT_BEGIN_LICENSE$
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
Jani Honkonen Add/modify license headers	r830	** 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$
		**
		****************************************************************************/

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