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

Block opengl series from being used as areaseries edges...

Block opengl series from being used as areaseries edges Change-Id: I33f751e2b4f0cbdbe6fdd8ffb69552ab683f01ba Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2840:8f5b72388cbe

Download file

             declarativeareaseries.cpp
        
                    113 lines
            
             | 3.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativeareaseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Added area series to QML api

              r847
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        Titta Heikkala
    
Updated license headers...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

        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.

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

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

        Titta Heikkala
    
Updated license headers...

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

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

      #include "declarativeareaseries.h"

        Tero Ahola
    
Removed unneeded includes from declarative plugin

              r1831
            
      #include "declarativelineseries.h"

        Tero Ahola
    
Added area series to QML api

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Added area series to QML api

              r847
            
      DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QAreaSeries(parent),

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          m_axes(new DeclarativeAxes(this))

        Tero Ahola
    
Added area series to QML api

              r847
            
      {

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

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

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

        Tero Ahola
    
Added area series to QML api

              r847
            
      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)

        Tero Ahola
    
Added area series to QML api

              r847
            
      {

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

              r1202
            
          QAreaSeries::setUpperSeries(series);

        Tero Ahola
    
Added area series to QML api

              r847
            
      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      {

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

              r1202
            
          return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      {

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

              r1202
            
          QAreaSeries::setLowerSeries(series);

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      }

        Jani Honkonen
    
coding style fixes for plugins

              r2101
            
      DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const

        Tero Ahola
    
Added area series to QML api

              r847
            
      {

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

              r1202
            
          return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());

        Tero Ahola
    
Added area series to QML api

              r847
            
      }

        Tero Ahola
    
Added missing QML properties to AreaSeries

              r1906
            
      qreal DeclarativeAreaSeries::borderWidth() const

      {

          return pen().widthF();

      }

      void DeclarativeAreaSeries::setBorderWidth(qreal width)

      {

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

              QPen p = pen();

              p.setWidthF(width);

              setPen(p);

              emit borderWidthChanged(width);

          }

      }

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

              r2681
            
      QString DeclarativeAreaSeries::brushFilename() const

      {

          return m_brushFilename;

      }

      void DeclarativeAreaSeries::setBrushFilename(const QString &brushFilename)

      {

          QImage brushImage(brushFilename);

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

              QBrush brush = QAreaSeries::brush();

              brush.setTextureImage(brushImage);

              QAreaSeries::setBrush(brush);

              m_brushFilename = brushFilename;

              m_brushImage = brushImage;

              emit brushFilenameChanged(brushFilename);

          }

      }

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

              m_brushFilename.clear();

              emit brushFilenameChanged(QString(""));

          }

      }

      void DeclarativeAreaSeries::setBrush(const QBrush &brush)

      {

          QAreaSeries::setBrush(brush);

          emit brushChanged();

      }

      QBrush DeclarativeAreaSeries::brush() const

      {

          return QAreaSeries::brush();

      }

        Tero Ahola
    
Added area series to QML api

              r847
            
      #include "moc_declarativeareaseries.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

Tero Ahola Added area series to QML api	r847	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Tero Ahola Added area series to QML api	r847	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Tero Ahola Added area series to QML api	r847	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Tero Ahola Added area series to QML api	r847	**
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.
Tero Ahola Added area series to QML api	r847	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Tero Ahola Added area series to QML api	r847	**
		****************************************************************************/

		#include "declarativeareaseries.h"
Tero Ahola Removed unneeded includes from declarative plugin	r1831	#include "declarativelineseries.h"
Tero Ahola Added area series to QML api	r847
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Added area series to QML api	r847
		DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
Tero Ahola Refactored QML axis handling	r1813	QAreaSeries(parent),
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	m_axes(new DeclarativeAxes(this))
Tero Ahola Added area series to QML api	r847	{
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)));
Titta Heikkala Add possibility to set brush image via QML API...	r2681	connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
Tero Ahola Added area series to QML api	r847	}

Jani Honkonen coding style fixes for plugins	r2101	void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)
Tero Ahola Added area series to QML api	r847	{
Tero Ahola Separated series model stuff from data api in QML examples	r1202	QAreaSeries::setUpperSeries(series);
Tero Ahola Added area series to QML api	r847	}

Jani Honkonen coding style fixes for plugins	r2101	DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const
Tero Ahola Now using only one declarative model	r1169	{
Tero Ahola Separated series model stuff from data api in QML examples	r1202	return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
Tero Ahola Now using only one declarative model	r1169	}

Jani Honkonen coding style fixes for plugins	r2101	void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)
Tero Ahola Now using only one declarative model	r1169	{
Tero Ahola Separated series model stuff from data api in QML examples	r1202	QAreaSeries::setLowerSeries(series);
Tero Ahola Now using only one declarative model	r1169	}

Jani Honkonen coding style fixes for plugins	r2101	DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const
Tero Ahola Added area series to QML api	r847	{
Tero Ahola Separated series model stuff from data api in QML examples	r1202	return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
Tero Ahola Added area series to QML api	r847	}

Tero Ahola Added missing QML properties to AreaSeries	r1906	qreal DeclarativeAreaSeries::borderWidth() const
		{
		return pen().widthF();
		}

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

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

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

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

		void DeclarativeAreaSeries::setBrush(const QBrush &brush)
		{
		QAreaSeries::setBrush(brush);
		emit brushChanged();
		}

		QBrush DeclarativeAreaSeries::brush() const
		{
		return QAreaSeries::brush();
		}

Tero Ahola Added area series to QML api	r847	#include "moc_declarativeareaseries.cpp"

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