HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/areachart/qareaseries.cpp

make piechartdrilldown compile again

Jani Honkonen - - Load All Authors

File last commit:

r796:4bbe1f66d4b7


                r798:2c85b9e659bd

Download file

             qareaseries.cpp
        
                    170 lines
            
             | 4.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / areachart / qareaseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

              r794
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 Digia Plc

      ** All rights reserved.

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

      **

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

      **

      ** $QT_BEGIN_LICENSE$

      ** Licensees holding valid Qt Commercial licenses may use this file in

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

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

      **

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

        Michal Klocek
    
Adds area chart...

              r421
            
      #include "qareaseries.h"

      #include "qlineseries.h"

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      /*!

          \class QAreaSeries

          \brief The QAreaSeries class is used for making area charts.

          \mainclass

      	An area chart is used to show quantitative data. It is based on line chart, in the way that area between axis and the line

      	is emphasized with color. Since the area chart is based on line chart, QAreaSeries constructor needs QLineSeries instance,

        Michal Klocek
    
typos in docs

              r424
            
      	which defines "upper" boundary of the area. "Lower" boundary is defined by default by axis X. Instead of axis X "lower" boundary can be specified by other line.

        Michal Klocek
    
Adds area chart...

              r421
            
      	In that case QAreaSeries should be initiated with two QLineSerie instances. Please note terms "upper" and "lower" boundary can be misleading in cases

        Michal Klocek
    
typos in docs

              r424
            
      	where "lower" boundary had bigger values than the "upper" one, however the main point that area between these two boundary lines will be filled.

        Michal Klocek
    
Adds area chart...

              r421
            
      	\image areachart.png

      	Creating basic area chart is simple:

      	\code

      	QLineSeries* lineSeries = new QLineSeries();

        Jani Honkonen
    
rename functions add() -> append()

              r796
            
          series->append(0, 6);

          series->append(2, 4);

        Michal Klocek
    
Adds area chart...

              r421
            
      	QAreaSeries* areaSeries = new QAreaSeries(lineSeries);

      	...

      	chartView->addSeries(areaSeries);

          \endcode

      */

      /*!

          \fn virtual QSeriesType QAreaSeries::type() const

          \brief Returns type of series.

          \sa QSeries, QSeriesType

      */

      /*!

         \fn QLineSeries* QAreaSeries::upperSeries() const

         \brief Returns upperSeries used to define one of area boundaries.

      */

      /*!

         \fn QLineSeries* QAreaSeries::lowerSeries() const

         \brief Returns lowerSeries used to define one of area boundaries. Note if QAreaSeries where counstucted wihtout a\ lowerSeries

          this function return Null pointer.

      */

      /*!

         \fn QPen QAreaSeries::pen() const

         \brief  Returns the pen used to draw line for this series.

          \sa setPen()

      */

      /*!

         \fn QPen QAreaSeries::brush() const

         \brief  Returns the brush used to draw line for this series.

          \sa setBrush()

      */

      /*!

         \fn bool  QAreaSeries::pointsVisible() const

         \brief  Returns if the points are drawn for this series.

          \sa setPointsVisible()

      */

        Michal Klocek
    
Updates presenter example documentation

              r574
            
      /*!

          \fn void QAreaSeries::clicked(const QPointF& point)

          \brief Signal is emitted when user clicks the \a point on area chart.

      */

        Michal Klocek
    
Adds area chart...

              r421
            
      /*!

          \fn void QAreaSeries::updated()

          \brief \internal

      */

      /*!

          Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a

          upperSeries line and \a lowerSeries line.  If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.

          When series object is added to QChartView or QChart instance ownerships is transfered.

      */

        Tero Ahola
    
Internal review: fixed minor issues in Area and XySeries

              r761
            
      QAreaSeries::QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries)

          : QSeries(upperSeries),

          m_upperSeries(upperSeries),

          m_lowerSeries(lowerSeries),

          m_pointsVisible(false)

        Michal Klocek
    
Adds area chart...

              r421
            
      {

      }

        Tero Ahola
    
Internal review: fixed minor issues in Area and XySeries

              r761
            
        Michal Klocek
    
Adds area chart...

              r421
            
      /*!

          Destroys the object. Series added to QChartView or QChart instances are owned by those,

          and are deleted when mentioned object are destroyed.

      */

      QAreaSeries::~QAreaSeries()

      {

      }

      /*!

          Sets \a pen used for drawing area outline.

      */

        Tero Ahola
    
Internal review: fixed minor issues in Area and XySeries

              r761
            
      void QAreaSeries::setPen(const QPen &pen)

        Michal Klocek
    
Adds area chart...

              r421
            
      {

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_pen != pen) {

              m_pen = pen;

        Michal Klocek
    
Refactors click signal to line,area,spline,scatter charts

              r571
            
              emit updated();

          }

        Michal Klocek
    
Adds area chart...

              r421
            
      }

      /*!

          Sets \a brush used for filling the area.

      */

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
      void QAreaSeries::setBrush(const QBrush &brush)

        Michal Klocek
    
Adds area chart...

              r421
            
      {

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_brush != brush) {

              m_brush = brush;

        Michal Klocek
    
Refactors click signal to line,area,spline,scatter charts

              r571
            
              emit updated();

          }

        Michal Klocek
    
Adds area chart...

              r421
            
      }

      /*!

          Sets if data points are \a visible and should be drawn on line.

      */

      void QAreaSeries::setPointsVisible(bool visible)

      {

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_pointsVisible != visible) {

              m_pointsVisible = visible;

        Michal Klocek
    
Refactors click signal to line,area,spline,scatter charts

              r571
            
              emit updated();

          }

        Michal Klocek
    
Adds area chart...

              r421
            
      }

        Marek Rosa
    
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series

              r630
            
      //bool QAreaSeries::setModel(QAbstractItemModel* model)

      //{

      //    m_upperSeries->setModel(model);

      //    if (m_lowerSeries)

      //        m_lowerSeries->setModel(model);

      //    return true;

      //}

      //void QAreaSeries::setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation)

      //{

      //    m_upperSeries->setModelMapping(modelX, modelY, orientation);

      //}

      //void QAreaSeries::setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation)

      //{

      //    if (m_lowerSeries)

      //        m_lowerSeries->setModelMapping(modelX, modelY, orientation);

      //}

        Michal Klocek
    
Adds area chart...

              r421
            
      #include "moc_qareaseries.cpp"

      QTCOMMERCIALCHART_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 license headers	r794	/****************************************************************************
		**
		** Copyright (C) 2012 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** 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$
		**
		****************************************************************************/

Michal Klocek Adds area chart...	r421	#include "qareaseries.h"
		#include "qlineseries.h"

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		/*!
		\class QAreaSeries
		\brief The QAreaSeries class is used for making area charts.

		\mainclass

		An area chart is used to show quantitative data. It is based on line chart, in the way that area between axis and the line
		is emphasized with color. Since the area chart is based on line chart, QAreaSeries constructor needs QLineSeries instance,
Michal Klocek typos in docs	r424	which defines "upper" boundary of the area. "Lower" boundary is defined by default by axis X. Instead of axis X "lower" boundary can be specified by other line.
Michal Klocek Adds area chart...	r421	In that case QAreaSeries should be initiated with two QLineSerie instances. Please note terms "upper" and "lower" boundary can be misleading in cases
Michal Klocek typos in docs	r424	where "lower" boundary had bigger values than the "upper" one, however the main point that area between these two boundary lines will be filled.
Michal Klocek Adds area chart...	r421
		\image areachart.png

		Creating basic area chart is simple:
		\code
		QLineSeries* lineSeries = new QLineSeries();
Jani Honkonen rename functions add() -> append()	r796	series->append(0, 6);
		series->append(2, 4);
Michal Klocek Adds area chart...	r421	QAreaSeries* areaSeries = new QAreaSeries(lineSeries);
		...
		chartView->addSeries(areaSeries);
		\endcode
		*/

		/*!
		\fn virtual QSeriesType QAreaSeries::type() const
		\brief Returns type of series.
		\sa QSeries, QSeriesType
		*/

		/*!
		\fn QLineSeries* QAreaSeries::upperSeries() const
		\brief Returns upperSeries used to define one of area boundaries.
		*/

		/*!
		\fn QLineSeries* QAreaSeries::lowerSeries() const
		\brief Returns lowerSeries used to define one of area boundaries. Note if QAreaSeries where counstucted wihtout a\ lowerSeries
		this function return Null pointer.
		*/

		/*!
		\fn QPen QAreaSeries::pen() const
		\brief Returns the pen used to draw line for this series.
		\sa setPen()
		*/

		/*!
		\fn QPen QAreaSeries::brush() const
		\brief Returns the brush used to draw line for this series.
		\sa setBrush()
		*/

		/*!
		\fn bool QAreaSeries::pointsVisible() const
		\brief Returns if the points are drawn for this series.
		\sa setPointsVisible()
		*/

Michal Klocek Updates presenter example documentation	r574	/*!
		\fn void QAreaSeries::clicked(const QPointF& point)
		\brief Signal is emitted when user clicks the \a point on area chart.
		*/

Michal Klocek Adds area chart...	r421	/*!
		\fn void QAreaSeries::updated()
		\brief \internal
		*/

		/*!
		Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a
		upperSeries line and \a lowerSeries line. If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.
		When series object is added to QChartView or QChart instance ownerships is transfered.
		*/
Tero Ahola Internal review: fixed minor issues in Area and XySeries	r761	QAreaSeries::QAreaSeries(QLineSeries upperSeries, QLineSeries lowerSeries)
		: QSeries(upperSeries),
		m_upperSeries(upperSeries),
		m_lowerSeries(lowerSeries),
		m_pointsVisible(false)
Michal Klocek Adds area chart...	r421	{
		}
Tero Ahola Internal review: fixed minor issues in Area and XySeries	r761
Michal Klocek Adds area chart...	r421	/*!
		Destroys the object. Series added to QChartView or QChart instances are owned by those,
		and are deleted when mentioned object are destroyed.
		*/
		QAreaSeries::~QAreaSeries()
		{
		}

		/*!
		Sets \a pen used for drawing area outline.
		*/
Tero Ahola Internal review: fixed minor issues in Area and XySeries	r761	void QAreaSeries::setPen(const QPen &pen)
Michal Klocek Adds area chart...	r421	{
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_pen != pen) {
		m_pen = pen;
Michal Klocek Refactors click signal to line,area,spline,scatter charts	r571	emit updated();
		}
Michal Klocek Adds area chart...	r421	}

		/*!
		Sets \a brush used for filling the area.
		*/
sauimone minor code review issues. indent, spaces, brackets etc.	r743	void QAreaSeries::setBrush(const QBrush &brush)
Michal Klocek Adds area chart...	r421	{
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_brush != brush) {
		m_brush = brush;
Michal Klocek Refactors click signal to line,area,spline,scatter charts	r571	emit updated();
		}
Michal Klocek Adds area chart...	r421	}
		/*!
		Sets if data points are \a visible and should be drawn on line.
		*/
		void QAreaSeries::setPointsVisible(bool visible)
		{
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_pointsVisible != visible) {
		m_pointsVisible = visible;
Michal Klocek Refactors click signal to line,area,spline,scatter charts	r571	emit updated();
		}
Michal Klocek Adds area chart...	r421	}

Marek Rosa Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series	r630	//bool QAreaSeries::setModel(QAbstractItemModel* model)
		//{
		// m_upperSeries->setModel(model);
		// if (m_lowerSeries)
		// m_lowerSeries->setModel(model);
		// return true;
		//}

		//void QAreaSeries::setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation)
		//{
		// m_upperSeries->setModelMapping(modelX, modelY, orientation);
		//}

		//void QAreaSeries::setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation)
		//{
		// if (m_lowerSeries)
		// m_lowerSeries->setModelMapping(modelX, modelY, orientation);
		//}

Michal Klocek Adds area chart...	r421	#include "moc_qareaseries.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE