HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · plugins/declarative/declarativesplineseries.h

Fix long label visibility...

Fix long label visibility The detection of overlapping items has been corrected. By default, item text is truncated thus only the ellipsis can overlap. Change-Id: I856f440184006b91c23e44d63ddef5b1796f38a1 Task-number: QTRD-3310 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Titta Heikkala - - Load All Authors

File last commit:

r2688:bdd8266c9c7d


                r2706:11c2ee82f698

Download file

             declarativesplineseries.h
        
                    123 lines
            
             | 5.7 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / plugins / declarative / declarativesplineseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add/modify license headers

              r830
            
      /****************************************************************************

      **

        Titta Heikkala
    
Update copyright year...

              r2688
            
      ** Copyright (C) 2014 Digia Plc

        Jani Honkonen
    
Add/modify license headers

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

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

        Jani Honkonen
    
Add/modify license headers

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

      **

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

        Tero Ahola
    
Spline to QML API

              r732
            
      #ifndef DECLARATIVESPLINESERIES_H

      #define DECLARATIVESPLINESERIES_H

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      #include "qsplineseries.h"

        Tero Ahola
    
Spline to QML API

              r732
            
      #include "declarativexyseries.h"

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
      #include "declarativeaxes.h"

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #include "shared_defines.h"

      #ifdef CHARTS_FOR_QUICK2

      #include <QtQml/QQmlListProperty>

      #include <QtQml/QQmlParserStatus>

      #else

        Jani Honkonen
    
Fixing qml build for latest Qt5...

              r2247
            
      #include <QtDeclarative/QDeclarativeListProperty>

      #include <QtDeclarative/QDeclarativeParserStatus>

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #endif

        Tero Ahola
    
Spline to QML API

              r732
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDECLARATIVE_PARSER_STATUS

        Tero Ahola
    
Spline to QML API

              r732
            
      {

          Q_OBJECT

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #ifdef CHARTS_FOR_QUICK2

          Q_INTERFACES(QQmlParserStatus)

      #else

        Tero Ahola
    
XY model mappers to QML api

              r1278
            
          Q_INTERFACES(QDeclarativeParserStatus)

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #endif

        Tero Ahola
    
QML xy-series data manipulation

              r1505
            
          Q_PROPERTY(int count READ count NOTIFY countChanged)

        Tero Ahola
    
QML API versioning to QtCommercial.Chart 1.1

              r1857
            
          Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)

          Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)

          Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)

          Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)

          Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)

          Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #ifdef CHARTS_FOR_QUICK2

          Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)

      #else

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
          Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #endif

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
          Q_CLASSINFO("DefaultProperty", "declarativeChildren")

        Tero Ahola
    
Spline to QML API

              r732
            
      public:

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
          explicit DeclarativeSplineSeries(QObject *parent = 0);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          QXYSeries *xySeries() { return this; }

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          QAbstractAxis *axisX() { return m_axes->axisX(); }

          void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); }

          QAbstractAxis *axisY() { return m_axes->axisY(); }

          void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); }

          Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }

          Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }

          Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }

          Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          Q_REVISION(3) QAbstractAxis *axisAngular() { return m_axes->axisX(); }

          Q_REVISION(3) void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); }

          Q_REVISION(3) QAbstractAxis *axisRadial() { return m_axes->axisY(); }

          Q_REVISION(3) void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); }

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          qreal width() const;

          void setWidth(qreal width);

          Qt::PenStyle style() const;

          void setStyle(Qt::PenStyle style);

          Qt::PenCapStyle capStyle() const;

          void setCapStyle(Qt::PenCapStyle capStyle);

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
          QDECLARATIVE_LIST_PROPERTY<QObject> declarativeChildren();

        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
        Tero Ahola
    
XY model mappers to QML api

              r1278
            
      public: // from QDeclarativeParserStatus

          void classBegin() { DeclarativeXySeries::classBegin(); }

          void componentComplete() { DeclarativeXySeries::componentComplete(); }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
      public:

          Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }

          Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }

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

              r2496
            
          Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
          Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }

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

              r2496
            
          Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }

        Tero Ahola
    
QML methods of series: several fixes and documentation

              r1521
            
          Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }

          Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }

          Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }

        Tero Ahola
    
QML weather example to use data API instead of model

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

              r1465
            
      Q_SIGNALS:

          void countChanged(int count);

        Tero Ahola
    
QML API versioning to QtCommercial.Chart 1.1

              r1857
            
          Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);

          Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);

          Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);

          Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);

        Tero Ahola
    
Adding missing QML series API line/border properties

              r1904
            
          Q_REVISION(1) void widthChanged(qreal width);

          Q_REVISION(1) void styleChanged(Qt::PenStyle style);

          Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);

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

              r1465
            
        Tero Ahola
    
Separated series model stuff from data api in QML examples

              r1202
            
      public Q_SLOTS:

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
          static void appendDeclarativeChildren(QDECLARATIVE_LIST_PROPERTY<QObject> *list, QObject *element);

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

              r1465
            
          void handleCountChanged(int index);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      public:

        Tero Ahola
    
Added axisXTop and axisYRight properties to QML series APIs

              r2296
            
          DeclarativeAxes *m_axes;

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      };

        Tero Ahola
    
Spline to QML API

              r732
            
      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // DECLARATIVESPLINESERIES_H

	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/modify license headers	r830	/****************************************************************************
		**
Titta Heikkala Update copyright year...	r2688	** Copyright (C) 2014 Digia Plc
Jani Honkonen Add/modify license headers	r830	** 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.
Jani Honkonen Add/modify license headers	r830	**
		** $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
Jani Honkonen Add/modify license headers	r830	** 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$
		**
		****************************************************************************/

Tero Ahola Spline to QML API	r732	#ifndef DECLARATIVESPLINESERIES_H
		#define DECLARATIVESPLINESERIES_H

Tero Ahola Declarative series classed now derived from QSeries childs	r789	#include "qsplineseries.h"
Tero Ahola Spline to QML API	r732	#include "declarativexyseries.h"
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	#include "declarativeaxes.h"
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#include "shared_defines.h"

		#ifdef CHARTS_FOR_QUICK2
		#include <QtQml/QQmlListProperty>
		#include <QtQml/QQmlParserStatus>
		#else
Jani Honkonen Fixing qml build for latest Qt5...	r2247	#include <QtDeclarative/QDeclarativeListProperty>
		#include <QtDeclarative/QDeclarativeParserStatus>
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#endif
Tero Ahola Spline to QML API	r732
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDECLARATIVE_PARSER_STATUS
Tero Ahola Spline to QML API	r732	{
		Q_OBJECT
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#ifdef CHARTS_FOR_QUICK2
		Q_INTERFACES(QQmlParserStatus)
		#else
Tero Ahola XY model mappers to QML api	r1278	Q_INTERFACES(QDeclarativeParserStatus)
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#endif
Tero Ahola QML xy-series data manipulation	r1505	Q_PROPERTY(int count READ count NOTIFY countChanged)
Tero Ahola QML API versioning to QtCommercial.Chart 1.1	r1857	Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
		Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
		Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
Miikka Heikkinen Add Polar chart support...	r2483	Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
		Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
Tero Ahola Adding missing QML series API line/border properties	r1904	Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
		Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
		Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#ifdef CHARTS_FOR_QUICK2
		Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)
		#else
Tero Ahola Separated series model stuff from data api in QML examples	r1202	Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#endif
Tero Ahola Separated series model stuff from data api in QML examples	r1202	Q_CLASSINFO("DefaultProperty", "declarativeChildren")
Tero Ahola Spline to QML API	r732
		public:
Tero Ahola Declarative series classed now derived from QSeries childs	r789	explicit DeclarativeSplineSeries(QObject *parent = 0);
Tero Ahola Refactored QML axis handling	r1813	QXYSeries *xySeries() { return this; }
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	QAbstractAxis *axisX() { return m_axes->axisX(); }
		void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
		QAbstractAxis *axisY() { return m_axes->axisY(); }
		void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
		Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
		Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
		Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
		Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Miikka Heikkinen Add Polar chart support...	r2483	Q_REVISION(3) QAbstractAxis *axisAngular() { return m_axes->axisX(); }
		Q_REVISION(3) void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
		Q_REVISION(3) QAbstractAxis *axisRadial() { return m_axes->axisY(); }
		Q_REVISION(3) void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
Tero Ahola Adding missing QML series API line/border properties	r1904	qreal width() const;
		void setWidth(qreal width);
		Qt::PenStyle style() const;
		void setStyle(Qt::PenStyle style);
		Qt::PenCapStyle capStyle() const;
		void setCapStyle(Qt::PenCapStyle capStyle);
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	QDECLARATIVE_LIST_PROPERTY<QObject> declarativeChildren();
Tero Ahola Separated series model stuff from data api in QML examples	r1202
Tero Ahola XY model mappers to QML api	r1278	public: // from QDeclarativeParserStatus
		void classBegin() { DeclarativeXySeries::classBegin(); }
		void componentComplete() { DeclarativeXySeries::componentComplete(); }

Tero Ahola QML methods of series: several fixes and documentation	r1521	public:
		Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
		Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
Miikka Heikkinen Implement index based removing/replacing points in series...	r2496	Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
Tero Ahola QML methods of series: several fixes and documentation	r1521	Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
Miikka Heikkinen Implement index based removing/replacing points in series...	r2496	Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
Tero Ahola QML methods of series: several fixes and documentation	r1521	Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
		Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
		Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
Tero Ahola QML weather example to use data API instead of model	r1222
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	Q_SIGNALS:
		void countChanged(int count);
Tero Ahola QML API versioning to QtCommercial.Chart 1.1	r1857	Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
		Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);
		Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);
Miikka Heikkinen Add Polar chart support...	r2483	Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);
		Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);
Tero Ahola Adding missing QML series API line/border properties	r1904	Q_REVISION(1) void widthChanged(qreal width);
		Q_REVISION(1) void styleChanged(Qt::PenStyle style);
		Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465
Tero Ahola Separated series model stuff from data api in QML examples	r1202	public Q_SLOTS:
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	static void appendDeclarativeChildren(QDECLARATIVE_LIST_PROPERTY<QObject> list, QObject element);
Tero Ahola Property notifications: axis minmax, bar properties, xyseries p-visibl and count	r1465	void handleCountChanged(int index);
Tero Ahola Refactored QML axis handling	r1813
		public:
Tero Ahola Added axisXTop and axisYRight properties to QML series APIs	r2296	DeclarativeAxes *m_axes;
Tero Ahola Declarative series classed now derived from QSeries childs	r789	};
Tero Ahola Spline to QML API	r732
		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // DECLARATIVESPLINESERIES_H