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

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

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: sync.profile Change-Id: Icdf61d347a6d0b3624867ceb8c1e4220c6c78a76

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2866:bbf52870f4e3

Download file

             declarativexypoint.cpp
        
                    65 lines
            
             | 2.1 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartsqml2 / declarativexypoint.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
            
        Tero Ahola
    
d

              r722
            
      #include "declarativexypoint.h"

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCore/QDataStream>

        Tero Ahola
    
d

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
d

              r722
            
        Titta Heikkala
    
Fix Charts documentation...

              r2639
            
      /*!

          \qmltype XYPoint

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          \inqmlmodule QtCharts

        Titta Heikkala
    
Fix Charts documentation...

              r2639
            
        Titta Heikkala
    
Add missing QML types to the documentation...

              r2727
            
          \brief Type is used to initialize XY-series coordinate data.

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          XYPoint is a convenience element for initializing XY-series with static coordinate data. To

          manipulate an XY-series dynamically, use it's data manipulation functions instead.

          \sa LineSeries, AreaSeries, ScatterSeries, SplineSeries

        Titta Heikkala
    
Fix Charts documentation...

              r2639
            
      */

        Tero Ahola
    
Documenting xy-series

              r1491
            
      /*!

        Tero Ahola
    
Renamed XyPoint to XYPoint

              r1532
            
          \qmlproperty real XYPoint::x

        Tero Ahola
    
Documenting xy-series

              r1491
            
          The x-coordinate of the point.

      */

      /*!

        Tero Ahola
    
Renamed XyPoint to XYPoint

              r1532
            
          \qmlproperty real XYPoint::y

        Tero Ahola
    
Documenting xy-series

              r1491
            
          The y-coordinate of the point.

      */

        Tero Ahola
    
Renamed XyPoint to XYPoint

              r1532
            
      DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) :

        Tero Ahola
    
d

              r722
            
          QObject(parent)

      {

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
          setX(0.0);

          setY(0.0);

        Tero Ahola
    
d

              r722
            
      }

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

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
Tero Ahola d	r722	#include "declarativexypoint.h"
Titta Heikkala Fix include syntax...	r2714	#include <QtCore/QDataStream>
Tero Ahola d	r722
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola d	r722
Titta Heikkala Fix Charts documentation...	r2639	/*!
		\qmltype XYPoint
Titta Heikkala Qt Charts project file structure change...	r2712	\inqmlmodule QtCharts
Titta Heikkala Fix Charts documentation...	r2639
Titta Heikkala Add missing QML types to the documentation...	r2727	\brief Type is used to initialize XY-series coordinate data.

Titta Heikkala Qt Charts project file structure change...	r2712	XYPoint is a convenience element for initializing XY-series with static coordinate data. To
		manipulate an XY-series dynamically, use it's data manipulation functions instead.
		\sa LineSeries, AreaSeries, ScatterSeries, SplineSeries
Titta Heikkala Fix Charts documentation...	r2639	*/
Tero Ahola Documenting xy-series	r1491
		/*!
Tero Ahola Renamed XyPoint to XYPoint	r1532	\qmlproperty real XYPoint::x
Tero Ahola Documenting xy-series	r1491	The x-coordinate of the point.
		*/

		/*!
Tero Ahola Renamed XyPoint to XYPoint	r1532	\qmlproperty real XYPoint::y
Tero Ahola Documenting xy-series	r1491	The y-coordinate of the point.
		*/

Tero Ahola Renamed XyPoint to XYPoint	r1532	DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) :
Tero Ahola d	r722	QObject(parent)
		{
Tero Ahola Declarative series classed now derived from QSeries childs	r789	setX(0.0);
		setY(0.0);
Tero Ahola d	r722	}

		#include "moc_declarativexypoint.cpp"

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