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

Fix area series point labels...

Fix area series point labels The point label string needs to be initialized before each point. Change-Id: I69df8b433c849324d9176ea5a20787cc938093e3 Task-number: QTRD-3637 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2778:6eb2f806ec7f

Download file

             declarativepieseries.cpp
        
                    152 lines
            
             | 4.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativepieseries.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
    
Dynamic data for QML pie and line series

              r215
            
      #include "declarativepieseries.h"

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QPieSlice>

      #include <QtCharts/QVPieModelMapper>

      #include <QtCharts/QHPieModelMapper>

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Dynamic data for QML pie and line series

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

              r2681
            
      DeclarativePieSlice::DeclarativePieSlice(QObject *parent)

          : QPieSlice(parent)

      {

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

      }

      QString DeclarativePieSlice::brushFilename() const

      {

          return m_brushFilename;

      }

      void DeclarativePieSlice::setBrushFilename(const QString &brushFilename)

      {

          QImage brushImage(brushFilename);

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

              QBrush brush = QPieSlice::brush();

              brush.setTextureImage(brushImage);

              QPieSlice::setBrush(brush);

              m_brushFilename = brushFilename;

              m_brushImage = brushImage;

              emit brushFilenameChanged(brushFilename);

          }

      }

      void DeclarativePieSlice::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() && QPieSlice::brush().textureImage() != m_brushImage) {

              m_brushFilename.clear();

              emit brushFilenameChanged(QString(""));

          }

      }

      // Declarative pie series =========================================================================

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      DeclarativePieSeries::DeclarativePieSeries(QQuickItem *parent) :

        Tero Ahola
    
Simplified declarative implementation

              r1117
            
          QPieSeries(parent)

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      {

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
          connect(this, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleAdded(QList<QPieSlice*>)));

          connect(this, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleRemoved(QList<QPieSlice*>)));

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      }

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      void DeclarativePieSeries::classBegin()

      {

      }

      void DeclarativePieSeries::componentComplete()

      {

        Jani Honkonen
    
coding style: foreach whitespace fix

              r2100
            
          foreach (QObject *child, children()) {

        Tero Ahola
    
Removed DeclarativePieSlice; properties in QPieSlice now

              r1329
            
              if (qobject_cast<QPieSlice *>(child)) {

                  QPieSeries::append(qobject_cast<QPieSlice *>(child));

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
              } else if (qobject_cast<QVPieModelMapper *>(child)) {

        Tero Ahola
    
QML: VPieModelMapper as a child for PieSeries

              r1254
            
                  QVPieModelMapper *mapper = qobject_cast<QVPieModelMapper *>(child);

                  mapper->setSeries(this);

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
              } else if (qobject_cast<QHPieModelMapper *>(child)) {

        Tero Ahola
    
QML: VPieModelMapper as a child for PieSeries

              r1254
            
                  QHPieModelMapper *mapper = qobject_cast<QHPieModelMapper *>(child);

                  mapper->setSeries(this);

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
              }

          }

      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QQmlListProperty<QObject> DeclarativePieSeries::seriesChildren()

        Tero Ahola
    
QML: VPieModelMapper as a child for PieSeries

              r1254
            
      {

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          return QQmlListProperty<QObject>(this, 0, &DeclarativePieSeries::appendSeriesChildren ,0,0,0);

        Tero Ahola
    
QML: VPieModelMapper as a child for PieSeries

              r1254
            
      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      void DeclarativePieSeries::appendSeriesChildren(QQmlListProperty<QObject> * list, QObject *element)

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      {

        Tero Ahola
    
QML: VPieModelMapper as a child for PieSeries

              r1254
            
          // Empty implementation; the children are parsed in componentComplete instead

          Q_UNUSED(list);

          Q_UNUSED(element);

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      }

        Tero Ahola
    
Removed DeclarativePieSlice; properties in QPieSlice now

              r1329
            
      QPieSlice *DeclarativePieSeries::at(int index)

        Tero Ahola
    
Added declarative model for bar series

              r1162
            
      {

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
          QList<QPieSlice *> sliceList = slices();

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
          if (index >= 0 && index < sliceList.count())

        Tero Ahola
    
Removed DeclarativePieSlice; properties in QPieSlice now

              r1329
            
              return sliceList[index];

        Tero Ahola
    
Added declarative model for bar series

              r1162
            
          return 0;

      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      QPieSlice *DeclarativePieSeries::find(QString label)

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

              r1202
            
      {

          foreach (QPieSlice *slice, slices()) {

              if (slice->label() == label)

        Tero Ahola
    
Removed DeclarativePieSlice; properties in QPieSlice now

              r1329
            
                  return slice;

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

              r1202
            
          }

          return 0;

      }

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

              r2681
            
      DeclarativePieSlice *DeclarativePieSeries::append(QString label, qreal value)

        Tero Ahola
    
Removed usage of model in QML pie example

              r1189
            
      {

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

              r2681
            
          DeclarativePieSlice *slice = new DeclarativePieSlice(this);

        Tero Ahola
    
App for demonstrating QML customization apis

              r1259
            
          slice->setLabel(label);

          slice->setValue(value);

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

              r2681
            
          if (QPieSeries::append(slice))

              return slice;

          delete slice;

          return 0;

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      }

        Tero Ahola
    
Implemented BarSeries::append, insert, remove and clear to QML API

              r1511
            
      bool DeclarativePieSeries::remove(QPieSlice *slice)

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
      {

        Tero Ahola
    
Implemented BarSeries::append, insert, remove and clear to QML API

              r1511
            
          return QPieSeries::remove(slice);

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
      }

      void DeclarativePieSeries::clear()

      {

          QPieSeries::clear();

      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      void DeclarativePieSeries::handleAdded(QList<QPieSlice *> slices)

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
      {

        Jani Honkonen
    
coding style: foreach whitespace fix

              r2100
            
          foreach (QPieSlice *slice, slices)

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
              emit sliceAdded(slice);

      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      void DeclarativePieSeries::handleRemoved(QList<QPieSlice *> slices)

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
      {

        Jani Honkonen
    
coding style: foreach whitespace fix

              r2100
            
          foreach (QPieSlice *slice, slices)

        Tero Ahola
    
QML api pie slice added/removed signals

              r1503
            
              emit sliceRemoved(slice);

      }

        Tero Ahola
    
Dynamic data for QML pie and line series

              r215
            
      #include "moc_declarativepieseries.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 Dynamic data for QML pie and line series	r215	#include "declarativepieseries.h"
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QPieSlice>
		#include <QtCharts/QVPieModelMapper>
		#include <QtCharts/QHPieModelMapper>
Tero Ahola Dynamic data for QML pie and line series	r215
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Dynamic data for QML pie and line series	r215
Titta Heikkala Add possibility to set brush image via QML API...	r2681	DeclarativePieSlice::DeclarativePieSlice(QObject *parent)
		: QPieSlice(parent)
		{
		connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
		}

		QString DeclarativePieSlice::brushFilename() const
		{
		return m_brushFilename;
		}

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

		void DeclarativePieSlice::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() && QPieSlice::brush().textureImage() != m_brushImage) {
		m_brushFilename.clear();
		emit brushFilenameChanged(QString(""));
		}
		}

		// Declarative pie series =========================================================================
Titta Heikkala Qt Charts project file structure change...	r2712	DeclarativePieSeries::DeclarativePieSeries(QQuickItem *parent) :
Tero Ahola Simplified declarative implementation	r1117	QPieSeries(parent)
Tero Ahola Dynamic data for QML pie and line series	r215	{
Tero Ahola QML api pie slice added/removed signals	r1503	connect(this, SIGNAL(added(QList<QPieSlice>)), this, SLOT(handleAdded(QList<QPieSlice>)));
		connect(this, SIGNAL(removed(QList<QPieSlice>)), this, SLOT(handleRemoved(QList<QPieSlice>)));
Tero Ahola Dynamic data for QML pie and line series	r215	}

Tero Ahola QML and static data in pie and xy series	r1186	void DeclarativePieSeries::classBegin()
		{
		}

		void DeclarativePieSeries::componentComplete()
		{
Jani Honkonen coding style: foreach whitespace fix	r2100	foreach (QObject *child, children()) {
Tero Ahola Removed DeclarativePieSlice; properties in QPieSlice now	r1329	if (qobject_cast<QPieSlice *>(child)) {
		QPieSeries::append(qobject_cast<QPieSlice *>(child));
Jani Honkonen coding style fixes for plugins	r2101	} else if (qobject_cast<QVPieModelMapper *>(child)) {
Tero Ahola QML: VPieModelMapper as a child for PieSeries	r1254	QVPieModelMapper mapper = qobject_cast<QVPieModelMapper >(child);
		mapper->setSeries(this);
Jani Honkonen coding style fixes for plugins	r2101	} else if (qobject_cast<QHPieModelMapper *>(child)) {
Tero Ahola QML: VPieModelMapper as a child for PieSeries	r1254	QHPieModelMapper mapper = qobject_cast<QHPieModelMapper >(child);
		mapper->setSeries(this);
Tero Ahola QML and static data in pie and xy series	r1186	}
		}
		}

Titta Heikkala Qt Charts project file structure change...	r2712	QQmlListProperty<QObject> DeclarativePieSeries::seriesChildren()
Tero Ahola QML: VPieModelMapper as a child for PieSeries	r1254	{
Titta Heikkala Qt Charts project file structure change...	r2712	return QQmlListProperty<QObject>(this, 0, &DeclarativePieSeries::appendSeriesChildren ,0,0,0);
Tero Ahola QML: VPieModelMapper as a child for PieSeries	r1254	}

Titta Heikkala Qt Charts project file structure change...	r2712	void DeclarativePieSeries::appendSeriesChildren(QQmlListProperty<QObject> * list, QObject *element)
Tero Ahola QML and static data in pie and xy series	r1186	{
Tero Ahola QML: VPieModelMapper as a child for PieSeries	r1254	// Empty implementation; the children are parsed in componentComplete instead
		Q_UNUSED(list);
		Q_UNUSED(element);
Tero Ahola QML and static data in pie and xy series	r1186	}

Tero Ahola Removed DeclarativePieSlice; properties in QPieSlice now	r1329	QPieSlice *DeclarativePieSeries::at(int index)
Tero Ahola Added declarative model for bar series	r1162	{
Jani Honkonen coding style fixes for plugins	r2101	QList<QPieSlice *> sliceList = slices();
Tero Ahola QML api pie slice added/removed signals	r1503	if (index >= 0 && index < sliceList.count())
Tero Ahola Removed DeclarativePieSlice; properties in QPieSlice now	r1329	return sliceList[index];
Tero Ahola Added declarative model for bar series	r1162
		return 0;
		}

Jani Honkonen coding style fixes for plugins	r2101	QPieSlice *DeclarativePieSeries::find(QString label)
Tero Ahola Separated series model stuff from data api in QML examples	r1202	{
		foreach (QPieSlice *slice, slices()) {
		if (slice->label() == label)
Tero Ahola Removed DeclarativePieSlice; properties in QPieSlice now	r1329	return slice;
Tero Ahola Separated series model stuff from data api in QML examples	r1202	}
		return 0;
		}

Titta Heikkala Add possibility to set brush image via QML API...	r2681	DeclarativePieSlice *DeclarativePieSeries::append(QString label, qreal value)
Tero Ahola Removed usage of model in QML pie example	r1189	{
Titta Heikkala Add possibility to set brush image via QML API...	r2681	DeclarativePieSlice *slice = new DeclarativePieSlice(this);
Tero Ahola App for demonstrating QML customization apis	r1259	slice->setLabel(label);
		slice->setValue(value);
Titta Heikkala Add possibility to set brush image via QML API...	r2681	if (QPieSeries::append(slice))
		return slice;
		delete slice;
		return 0;
Tero Ahola Dynamic data for QML pie and line series	r215	}

Tero Ahola Implemented BarSeries::append, insert, remove and clear to QML API	r1511	bool DeclarativePieSeries::remove(QPieSlice *slice)
Tero Ahola QML api pie slice added/removed signals	r1503	{
Tero Ahola Implemented BarSeries::append, insert, remove and clear to QML API	r1511	return QPieSeries::remove(slice);
Tero Ahola QML api pie slice added/removed signals	r1503	}

		void DeclarativePieSeries::clear()
		{
		QPieSeries::clear();
		}

Jani Honkonen coding style fixes for plugins	r2101	void DeclarativePieSeries::handleAdded(QList<QPieSlice *> slices)
Tero Ahola QML api pie slice added/removed signals	r1503	{
Jani Honkonen coding style: foreach whitespace fix	r2100	foreach (QPieSlice *slice, slices)
Tero Ahola QML api pie slice added/removed signals	r1503	emit sliceAdded(slice);
		}

Jani Honkonen coding style fixes for plugins	r2101	void DeclarativePieSeries::handleRemoved(QList<QPieSlice *> slices)
Tero Ahola QML api pie slice added/removed signals	r1503	{
Jani Honkonen coding style: foreach whitespace fix	r2100	foreach (QPieSlice *slice, slices)
Tero Ahola QML api pie slice added/removed signals	r1503	emit sliceRemoved(slice);
		}

Tero Ahola Dynamic data for QML pie and line series	r215	#include "moc_declarativepieseries.cpp"

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