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

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

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

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2879:d27b6b26880d

Download file

             declarativexyseries.cpp
        
                    134 lines
            
             | 4.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativexyseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

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

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        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/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
        Marek Rosa
    
removed many unnecessary includes from declarative files

              r1669
            
        Marek Rosa
    
Changed include to small letter first becasue it didn't build on Linux

              r736
            
      #include "declarativexyseries.h"

        Tero Ahola
    
Removed unneeded includes from declarative plugin

              r1831
            
      #include "declarativexypoint.h"

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QVXYModelMapper>

      #include <QtCharts/QHXYModelMapper>

        Tero Ahola
    
Spline to QML API

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Spline to QML API

              r732
            
        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      DeclarativeXySeries::DeclarativeXySeries()

        Tero Ahola
    
Spline to QML API

              r732
            
      {

      }

      DeclarativeXySeries::~DeclarativeXySeries()

      {

      }

        Tero Ahola
    
XY model mappers to QML api

              r1278
            
      void DeclarativeXySeries::classBegin()

      {

      }

      void DeclarativeXySeries::componentComplete()

      {

        Tero Ahola
    
Use qobject_cast instead of reinterpret_cast in xy series casts

              r1401
            
          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

        Jani Honkonen
    
coding style: foreach whitespace fix

              r2100
            
          foreach (QObject *child, series->children()) {

        Tero Ahola
    
Renamed XyPoint to XYPoint

              r1532
            
              if (qobject_cast<DeclarativeXYPoint *>(child)) {

                  DeclarativeXYPoint *point = qobject_cast<DeclarativeXYPoint *>(child);

        Tero Ahola
    
Property notifications: axis minmax, bar properties, xyseries p-visibl and count

              r1465
            
                  series->append(point->x(), point->y());

        Jani Honkonen
    
coding style fixes for plugins

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

        Tero Ahola
    
XY model mappers to QML api

              r1278
            
                  QVXYModelMapper *mapper = qobject_cast<QVXYModelMapper *>(child);

                  mapper->setSeries(series);

        Jani Honkonen
    
coding style fixes for plugins

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

        Tero Ahola
    
XY model mappers to QML api

              r1278
            
                  QHXYModelMapper *mapper = qobject_cast<QHXYModelMapper *>(child);

                  mapper->setSeries(series);

              }

          }

      }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      void DeclarativeXySeries::append(qreal x, qreal y)

        Tero Ahola
    
App for demonstrating QML customization apis

              r1259
            
      {

        Tero Ahola
    
Use qobject_cast instead of reinterpret_cast in xy series casts

              r1401
            
          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
          series->append(x, y);

        Tero Ahola
    
App for demonstrating QML customization apis

              r1259
            
      }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      void DeclarativeXySeries::replace(qreal oldX, qreal oldY, qreal newX, qreal newY)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->replace(oldX, oldY, newX, newY);

      }

        Miikka Heikkinen
    
Implement index based removing/replacing points in series...

              r2496
            
      void DeclarativeXySeries::replace(int index, qreal newX, qreal newY)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->replace(index, newX, newY);

      }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      void DeclarativeXySeries::remove(qreal x, qreal y)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->remove(x, y);

      }

        Miikka Heikkinen
    
Implement index based removing/replacing points in series...

              r2496
            
      void DeclarativeXySeries::remove(int index)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->remove(index);

      }

        Miikka Heikkinen
    
Add a method to remove more than one point to QXYSeries...

              r2805
            
      void DeclarativeXySeries::removePoints(int index, int count)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->removePoints(index, count);

      }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      void DeclarativeXySeries::insert(int index, qreal x, qreal y)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->insert(index, QPointF(x, y));

      }

      void DeclarativeXySeries::clear()

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

          series->clear();

      }

      QPointF DeclarativeXySeries::at(int index)

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());

          Q_ASSERT(series);

        Andy Shaw
    
Check the index is within the valid range...

              r2765
            
          if (index >= 0 && index < series->count())

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
              return series->points().at(index);

          return QPointF(0, 0);

      }

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
        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/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add/modify license headers	r830	**
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/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add/modify license headers	r830
Marek Rosa removed many unnecessary includes from declarative files	r1669
Marek Rosa Changed include to small letter first becasue it didn't build on Linux	r736	#include "declarativexyseries.h"
Tero Ahola Removed unneeded includes from declarative plugin	r1831	#include "declarativexypoint.h"
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QVXYModelMapper>
		#include <QtCharts/QHXYModelMapper>
Tero Ahola Spline to QML API	r732
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Spline to QML API	r732
Tero Ahola Declarative series classed now derived from QSeries childs	r789	DeclarativeXySeries::DeclarativeXySeries()
Tero Ahola Spline to QML API	r732	{
		}

		DeclarativeXySeries::~DeclarativeXySeries()
		{
		}

Tero Ahola XY model mappers to QML api	r1278	void DeclarativeXySeries::classBegin()
		{
		}

		void DeclarativeXySeries::componentComplete()
		{
Tero Ahola Use qobject_cast instead of reinterpret_cast in xy series casts	r1401	QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);

Jani Honkonen coding style: foreach whitespace fix	r2100	foreach (QObject *child, series->children()) {
Tero Ahola Renamed XyPoint to XYPoint	r1532	if (qobject_cast<DeclarativeXYPoint *>(child)) {
		DeclarativeXYPoint point = qobject_cast<DeclarativeXYPoint >(child);
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	series->append(point->x(), point->y());
Jani Honkonen coding style fixes for plugins	r2101	} else if (qobject_cast<QVXYModelMapper *>(child)) {
Tero Ahola XY model mappers to QML api	r1278	QVXYModelMapper mapper = qobject_cast<QVXYModelMapper >(child);
		mapper->setSeries(series);
Jani Honkonen coding style fixes for plugins	r2101	} else if (qobject_cast<QHXYModelMapper *>(child)) {
Tero Ahola XY model mappers to QML api	r1278	QHXYModelMapper mapper = qobject_cast<QHXYModelMapper >(child);
		mapper->setSeries(series);
		}
		}
		}

Tero Ahola QML methods of series: several fixes and documentation	r1521	void DeclarativeXySeries::append(qreal x, qreal y)
Tero Ahola App for demonstrating QML customization apis	r1259	{
Tero Ahola Use qobject_cast instead of reinterpret_cast in xy series casts	r1401	QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
Tero Ahola QML methods of series: several fixes and documentation	r1521	series->append(x, y);
Tero Ahola App for demonstrating QML customization apis	r1259	}

Tero Ahola QML methods of series: several fixes and documentation	r1521	void DeclarativeXySeries::replace(qreal oldX, qreal oldY, qreal newX, qreal newY)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->replace(oldX, oldY, newX, newY);
		}

Miikka Heikkinen Implement index based removing/replacing points in series...	r2496	void DeclarativeXySeries::replace(int index, qreal newX, qreal newY)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->replace(index, newX, newY);
		}

Tero Ahola QML methods of series: several fixes and documentation	r1521	void DeclarativeXySeries::remove(qreal x, qreal y)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->remove(x, y);
		}

Miikka Heikkinen Implement index based removing/replacing points in series...	r2496	void DeclarativeXySeries::remove(int index)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->remove(index);
		}

Miikka Heikkinen Add a method to remove more than one point to QXYSeries...	r2805	void DeclarativeXySeries::removePoints(int index, int count)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->removePoints(index, count);
		}

Tero Ahola QML methods of series: several fixes and documentation	r1521	void DeclarativeXySeries::insert(int index, qreal x, qreal y)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->insert(index, QPointF(x, y));
		}

		void DeclarativeXySeries::clear()
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
		series->clear();
		}

		QPointF DeclarativeXySeries::at(int index)
		{
		QXYSeries series = qobject_cast<QXYSeries >(xySeries());
		Q_ASSERT(series);
Andy Shaw Check the index is within the valid range...	r2765	if (index >= 0 && index < series->count())
Tero Ahola QML methods of series: several fixes and documentation	r1521	return series->points().at(index);
		return QPointF(0, 0);
		}
Tero Ahola QML demo with dynamic data	r1240
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE