HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/splinechart/qsplineseries.cpp

Merge remote-tracking branch 'origin/5.7' into dev...

Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I86dec1064d79704214e885681449ca347b193d66

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2895:e9a2e2a5e9c0

Download file

             qsplineseries.cpp
        
                    175 lines
            
             | 5.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / splinechart / qsplineseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

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

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** and conditions see https://www.qt.io/terms-conditions. For further

      ** information use the contact form at https://www.qt.io/contact-us.

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Jani Honkonen
    
Add license headers

              r794
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QSplineSeries>

      #include <private/qsplineseries_p.h>

      #include <private/splinechartitem_p.h>

      #include <private/chartdataset_p.h>

      #include <private/charttheme_p.h>

      #include <private/splineanimation_p.h>

      #include <private/qchart_p.h>

        Marek Rosa
    
Spline initial

              r295
            
        Marek Rosa
    
QSplineSeries documentation added

              r433
            
      /*!

          \class QSplineSeries

        Titta Heikkala
    
Fix Charts documentation...

              r2639
            
          \inmodule Qt Charts

        Marek Rosa
    
QSplineSeries documentation added

              r433
            
          \brief Series type used to store data needed to draw a spline.

          QSplineSeries stores the data points along with the segment control points needed by QPainterPath to draw spline

          Control points are automatically calculated when data changes. The algorithm computes the points so that the normal spline can be drawn.

        Tero Ahola
    
Documentation fixes....

              r995
            
          \image examples_splinechart.png

          Creating basic spline chart is simple:

          \code

          QSplineSeries* series = new QSplineSeries();

          series->append(0, 6);

          series->append(2, 4);

          ...

          chart->addSeries(series);

          \endcode

        Marek Rosa
    
QSplineSeries documentation added

              r433
            
      */

        Titta Heikkala
    
Fix Charts documentation...

              r2639
            
      /*!

          \qmltype SplineSeries

          \instantiates QSplineSeries

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          \inqmlmodule QtCharts

        Marek Rosa
    
QSplineSeries documentation added

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

              r2712
            
          \inherits XYSeries

          \brief The SplineSeries type is used for making spline charts.

        Tero Ahola
    
Documenting xy-series

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

              r2712
            
          The following QML shows how to create a simple spline chart:

          \snippet qmlchart/qml/qmlchart/View3.qml 1

          \beginfloatleft

          \image examples_qmlchart3.png

          \endfloat

          \clearfloat

        Tero Ahola
    
Documenting xy-series

              r1491
            
      */

      /*!

          \fn QSeriesType QSplineSeries::type() const

          Returns the type of the series

      */

        Marek Rosa
    
QSplineSeries documentation added

              r433
            
        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
      /*!

          \qmlproperty real SplineSeries::width

          The width of the line. By default the width is 2.0.

      */

      /*!

          \qmlproperty Qt::PenStyle SplineSeries::style

          Controls the style of the line. Set to one of Qt.NoPen, Qt.SolidLine, Qt.DashLine, Qt.DotLine,

          Qt.DashDotLine or Qt.DashDotDotLine. Using Qt.CustomDashLine is not supported in the QML API.

          By default the style is Qt.SolidLine.

      */

      /*!

          \qmlproperty Qt::PenCapStyle SplineSeries::capStyle

          Controls the cap style of the line. Set to one of Qt.FlatCap, Qt.SquareCap or Qt.RoundCap. By

          default the cap style is Qt.SquareCap.

      */

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Marek Rosa
    
Spline working somewhat

              r401
            
        Marek Rosa
    
QSplineSeries documentation added

              r433
            
      /*!

          Constructs empty series object which is a child of \a parent.

        Miikka Heikkinen
    
Documentation updates...

              r2494
            
          When series object is added to a QChart instance then the ownerships is transferred.

        Marek Rosa
    
QSplineSeries documentation added

              r433
            
        */

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
      QSplineSeries::QSplineSeries(QObject *parent)

          : QLineSeries(*new QSplineSeriesPrivate(this), parent)

        Marek Rosa
    
Spline initial

              r295
            
      {

      }

        Marek Rosa
    
Spline some more

              r305
            
        Jani Honkonen
    
random doc updates

              r1351
            
      /*!

        Destroys the object.

      */

        Michal Klocek
    
Bugfixes for spline vector allocation issues

              r1082
            
      QSplineSeries::~QSplineSeries()

      {

          Q_D(QSplineSeries);

        Michal Klocek
    
Refactors internals...

              r2273
            
          if (d->m_chart)

              d->m_chart->removeSeries(this);

        Michal Klocek
    
Bugfixes for spline vector allocation issues

              r1082
            
      }

        Michal Klocek
    
Fixes to API , QSeriesType -> SeriesType , add missing getters

              r1107
            
      QAbstractSeries::SeriesType QSplineSeries::type() const

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      {

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
          return QAbstractSeries::SeriesTypeSpline;

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      }

      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
      QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries *q)

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          : QLineSeriesPrivate(q)

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      {

        Marek Rosa
    
Added license text to piemodelmapper classes

              r1309
            
      }

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
        Michal Klocek
    
Refactors internals...

              r2273
            
      void QSplineSeriesPrivate::initializeGraphics(QGraphicsItem* parent)

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
      {

          Q_Q(QSplineSeries);

        Michal Klocek
    
Refactors internals...

              r2273
            
          SplineChartItem *spline = new SplineChartItem(q,parent);

          m_item.reset(spline);

          QAbstractSeriesPrivate::initializeGraphics(parent);

      }

      void QSplineSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)

      {

          Q_Q(QSplineSeries);

          const QList<QColor> colors = theme->seriesColors();

        Miikka Heikkinen
    
Fix explicitly set default pen/brush/font getting overridden by theme...

              r2516
            
          if (forced || QChartPrivate::defaultPen() == m_pen) {

              QPen pen;

        Michal Klocek
    
Refactors internals...

              r2273
            
              pen.setColor(colors.at(index % colors.size()));

              pen.setWidthF(2);

              q->setPen(pen);

          }

        Titta Heikkala
    
Added possibility to show series value...

              r2689
            
          if (forced || QChartPrivate::defaultPen().color() == m_pointLabelsColor) {

              QColor color = theme->labelBrush().color();

              q->setPointLabelsColor(color);

          }

        Michal Klocek
    
Refactors internals...

              r2273
            
      }

        Titta Heikkala
    
Added possibility to set duration and easing curve for chart animation...

              r2804
            
      void QSplineSeriesPrivate::initializeAnimations(QtCharts::QChart::AnimationOptions options,

                                                      int duration, QEasingCurve &curve)

        Michal Klocek
    
Refactors internals...

              r2273
            
      {

          SplineChartItem *item = static_cast<SplineChartItem *>(m_item.data());

          Q_ASSERT(item);

        Miikka Heikkinen
    
Fix resetting animation options mid-animation....

              r2555
            
          if (item->animation())

              item->animation()->stopAndDestroyLater();

          if (options.testFlag(QChart::SeriesAnimations))

        Titta Heikkala
    
Added possibility to set duration and easing curve for chart animation...

              r2804
            
              item->setAnimation(new SplineAnimation(item, duration, curve));

        Miikka Heikkinen
    
Fix resetting animation options mid-animation....

              r2555
            
          else

        Michal Klocek
    
Refactors internals...

              r2273
            
              item->setAnimation(0);

        Titta Heikkala
    
Added possibility to set duration and easing curve for chart animation...

              r2804
            
          QAbstractSeriesPrivate::initializeAnimations(options, duration, curve);

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
      }

        Marek Rosa
    
Spline working somewhat

              r401
            
      #include "moc_qsplineseries.cpp"

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      #include "moc_qsplineseries_p.cpp"

        Marek Rosa
    
Spline working somewhat

              r401
            
        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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add license headers	r794
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QSplineSeries>
		#include <private/qsplineseries_p.h>
		#include <private/splinechartitem_p.h>
		#include <private/chartdataset_p.h>
		#include <private/charttheme_p.h>
		#include <private/splineanimation_p.h>
		#include <private/qchart_p.h>
Marek Rosa Spline initial	r295
Marek Rosa QSplineSeries documentation added	r433	/*!
		\class QSplineSeries
Titta Heikkala Fix Charts documentation...	r2639	\inmodule Qt Charts
Marek Rosa QSplineSeries documentation added	r433	\brief Series type used to store data needed to draw a spline.

		QSplineSeries stores the data points along with the segment control points needed by QPainterPath to draw spline
		Control points are automatically calculated when data changes. The algorithm computes the points so that the normal spline can be drawn.
Tero Ahola Documentation fixes....	r995
		\image examples_splinechart.png

		Creating basic spline chart is simple:
		\code
		QSplineSeries* series = new QSplineSeries();
		series->append(0, 6);
		series->append(2, 4);
		...
		chart->addSeries(series);
		\endcode
Marek Rosa QSplineSeries documentation added	r433	*/
Titta Heikkala Fix Charts documentation...	r2639	/*!
		\qmltype SplineSeries
		\instantiates QSplineSeries
Titta Heikkala Qt Charts project file structure change...	r2712	\inqmlmodule QtCharts
Marek Rosa QSplineSeries documentation added	r433
Titta Heikkala Qt Charts project file structure change...	r2712	\inherits XYSeries

		\brief The SplineSeries type is used for making spline charts.
Tero Ahola Documenting xy-series	r1491
Titta Heikkala Qt Charts project file structure change...	r2712	The following QML shows how to create a simple spline chart:
		\snippet qmlchart/qml/qmlchart/View3.qml 1
		\beginfloatleft
		\image examples_qmlchart3.png
		\endfloat
		\clearfloat
Tero Ahola Documenting xy-series	r1491	*/

		/*!
		\fn QSeriesType QSplineSeries::type() const
		Returns the type of the series
		*/
Marek Rosa QSplineSeries documentation added	r433
Tero Ahola Adding missing QML series API line/border properties	r1904	/*!
		\qmlproperty real SplineSeries::width
		The width of the line. By default the width is 2.0.
		*/

		/*!
		\qmlproperty Qt::PenStyle SplineSeries::style
		Controls the style of the line. Set to one of Qt.NoPen, Qt.SolidLine, Qt.DashLine, Qt.DotLine,
		Qt.DashDotLine or Qt.DashDotDotLine. Using Qt.CustomDashLine is not supported in the QML API.
		By default the style is Qt.SolidLine.
		*/

		/*!
		\qmlproperty Qt::PenCapStyle SplineSeries::capStyle
		Controls the cap style of the line. Set to one of Qt.FlatCap, Qt.SquareCap or Qt.RoundCap. By
		default the cap style is Qt.SquareCap.
		*/

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Marek Rosa Spline working somewhat	r401
Marek Rosa QSplineSeries documentation added	r433	/*!
		Constructs empty series object which is a child of \a parent.
Miikka Heikkinen Documentation updates...	r2494	When series object is added to a QChart instance then the ownerships is transferred.
Marek Rosa QSplineSeries documentation added	r433	*/

Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	QSplineSeries::QSplineSeries(QObject *parent)
		: QLineSeries(*new QSplineSeriesPrivate(this), parent)
Marek Rosa Spline initial	r295	{
		}
Marek Rosa Spline some more	r305
Jani Honkonen random doc updates	r1351	/*!
		Destroys the object.
		*/
Michal Klocek Bugfixes for spline vector allocation issues	r1082	QSplineSeries::~QSplineSeries()
		{
		Q_D(QSplineSeries);
Michal Klocek Refactors internals...	r2273	if (d->m_chart)
		d->m_chart->removeSeries(this);
Michal Klocek Bugfixes for spline vector allocation issues	r1082	}

Michal Klocek Fixes to API , QSeriesType -> SeriesType , add missing getters	r1107	QAbstractSeries::SeriesType QSplineSeries::type() const
Michal Klocek Adds big fat pimpl to series classes...	r938	{
Tero Ahola Renamed QSeries to QAbstractSeries	r988	return QAbstractSeries::SeriesTypeSpline;
Michal Klocek Adds big fat pimpl to series classes...	r938	}

		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Jani Honkonen more coding style fixes for src-folder...	r2104	QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries *q)
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	: QLineSeriesPrivate(q)
Michal Klocek Adds big fat pimpl to series classes...	r938	{
Marek Rosa Added license text to piemodelmapper classes	r1309	}
Michal Klocek Adds big fat pimpl to series classes...	r938
Michal Klocek Refactors internals...	r2273	void QSplineSeriesPrivate::initializeGraphics(QGraphicsItem* parent)
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	{
		Q_Q(QSplineSeries);
Michal Klocek Refactors internals...	r2273	SplineChartItem *spline = new SplineChartItem(q,parent);
		m_item.reset(spline);
		QAbstractSeriesPrivate::initializeGraphics(parent);
		}

		void QSplineSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
		{
		Q_Q(QSplineSeries);
		const QList<QColor> colors = theme->seriesColors();

Miikka Heikkinen Fix explicitly set default pen/brush/font getting overridden by theme...	r2516	if (forced \|\| QChartPrivate::defaultPen() == m_pen) {
		QPen pen;
Michal Klocek Refactors internals...	r2273	pen.setColor(colors.at(index % colors.size()));
		pen.setWidthF(2);
		q->setPen(pen);
		}
Titta Heikkala Added possibility to show series value...	r2689
		if (forced \|\| QChartPrivate::defaultPen().color() == m_pointLabelsColor) {
		QColor color = theme->labelBrush().color();
		q->setPointLabelsColor(color);
		}
Michal Klocek Refactors internals...	r2273	}

Titta Heikkala Added possibility to set duration and easing curve for chart animation...	r2804	void QSplineSeriesPrivate::initializeAnimations(QtCharts::QChart::AnimationOptions options,
		int duration, QEasingCurve &curve)
Michal Klocek Refactors internals...	r2273	{
		SplineChartItem item = static_cast<SplineChartItem >(m_item.data());
		Q_ASSERT(item);
Miikka Heikkinen Fix resetting animation options mid-animation....	r2555	if (item->animation())
		item->animation()->stopAndDestroyLater();

		if (options.testFlag(QChart::SeriesAnimations))
Titta Heikkala Added possibility to set duration and easing curve for chart animation...	r2804	item->setAnimation(new SplineAnimation(item, duration, curve));
Miikka Heikkinen Fix resetting animation options mid-animation....	r2555	else
Michal Klocek Refactors internals...	r2273	item->setAnimation(0);
Titta Heikkala Added possibility to set duration and easing curve for chart animation...	r2804	QAbstractSeriesPrivate::initializeAnimations(options, duration, curve);
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	}

Marek Rosa Spline working somewhat	r401	#include "moc_qsplineseries.cpp"
Michal Klocek Adds big fat pimpl to series classes...	r938	#include "moc_qsplineseries_p.cpp"
Marek Rosa Spline working somewhat	r401
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE