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

Fix Charts build when quick module is not build...

Fix Charts build when quick module is not build The QML side of Charts should not be built when Qt quick module is not present. Change-Id: Id48fe3c50f365ad195c90da6364d27afd97b90e2 Task-number: QTRD-3273 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2712:c544258484ff


                r2724:c26fb372333d

Download file

             declarativeareaseries.cpp
        
                    115 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
    
Update copyright year...

              r2688
            
      ** Copyright (C) 2014 Digia Plc

        Tero Ahola
    
Added area series to QML api

              r847
            
      ** 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.

        Tero Ahola
    
Added area series to QML api

              r847
            
      **

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

        Tero Ahola
    
Added area series to QML api

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

      **

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

      #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 Update copyright year...	r2688	** Copyright (C) 2014 Digia Plc
Tero Ahola Added area series to QML api	r847	** 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.
Tero Ahola Added area series to QML api	r847	**
		** $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
Tero Ahola Added area series to QML api	r847	** 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$
		**
		****************************************************************************/

		#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