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

Added HTML support for various text items...

Added HTML support for various text items - HTML tags can now be used in chart titles, legends, and labels - '\n' does no longer cause line break in multi-line text items. HTML tag <br/> can be used for line break now. - Setting pen for axis titles and labels is deprecated - When setting brush for titles and labels, only the color is relevant - Logic for identifying label format specifiers was improved, so adding additional information to labels via label format string is now more viable. Task-number: QTRD-1912 Change-Id: I8fa56df56fd656e2a3e427eff4abf3481435eec7 Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2496:764230e0c100


                r2539:74f3dbde7a75

Download file

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

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

      **

      ** Copyright (C) 2013 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$

      **

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

      #ifndef DECLARATIVESPLINESERIES_H

      #define DECLARATIVESPLINESERIES_H

      #include "qsplineseries.h"

      #include "declarativexyseries.h"

      #include "declarativeaxes.h"

      #include "shared_defines.h"

      #ifdef CHARTS_FOR_QUICK2

      #include <QtQml/QQmlListProperty>

      #include <QtQml/QQmlParserStatus>

      #else

      #include <QtDeclarative/QDeclarativeListProperty>

      #include <QtDeclarative/QDeclarativeParserStatus>

      #endif

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDECLARATIVE_PARSER_STATUS

      {

          Q_OBJECT

      #ifdef CHARTS_FOR_QUICK2

          Q_INTERFACES(QQmlParserStatus)

      #else

          Q_INTERFACES(QDeclarativeParserStatus)

      #endif

          Q_PROPERTY(int count READ count NOTIFY countChanged)

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

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

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

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

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

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

          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)

      #ifdef CHARTS_FOR_QUICK2

          Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)

      #else

          Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)

      #endif

          Q_CLASSINFO("DefaultProperty", "declarativeChildren")

      public:

          explicit DeclarativeSplineSeries(QObject *parent = 0);

          QXYSeries *xySeries() { return this; }

          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); }

          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); }

          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);

          QDECLARATIVE_LIST_PROPERTY<QObject> declarativeChildren();

      public: // from QDeclarativeParserStatus

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

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

      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); }

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

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

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

          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); }

      Q_SIGNALS:

          void countChanged(int count);

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

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

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

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

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

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

          Q_REVISION(1) void widthChanged(qreal width);

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

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

      public Q_SLOTS:

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

          void handleCountChanged(int index);

      public:

          DeclarativeAxes *m_axes;

      };

      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

				/****************************************************************************
				**
				** Copyright (C) 2013 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$
				**
				****************************************************************************/

				#ifndef DECLARATIVESPLINESERIES_H
				#define DECLARATIVESPLINESERIES_H

				#include "qsplineseries.h"
				#include "declarativexyseries.h"
				#include "declarativeaxes.h"
				#include "shared_defines.h"

				#ifdef CHARTS_FOR_QUICK2
				#include <QtQml/QQmlListProperty>
				#include <QtQml/QQmlParserStatus>
				#else
				#include <QtDeclarative/QDeclarativeListProperty>
				#include <QtDeclarative/QDeclarativeParserStatus>
				#endif

				QTCOMMERCIALCHART_BEGIN_NAMESPACE

				class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDECLARATIVE_PARSER_STATUS
				{
				Q_OBJECT
				#ifdef CHARTS_FOR_QUICK2
				Q_INTERFACES(QQmlParserStatus)
				#else
				Q_INTERFACES(QDeclarativeParserStatus)
				#endif
				Q_PROPERTY(int count READ count NOTIFY countChanged)
				Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
				Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
				Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
				Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
				Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
				Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
				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)
				#ifdef CHARTS_FOR_QUICK2
				Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren)
				#else
				Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
				#endif
				Q_CLASSINFO("DefaultProperty", "declarativeChildren")

				public:
				explicit DeclarativeSplineSeries(QObject *parent = 0);
				QXYSeries *xySeries() { return this; }
				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); }
				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); }
				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);
				QDECLARATIVE_LIST_PROPERTY<QObject> declarativeChildren();

				public: // from QDeclarativeParserStatus
				void classBegin() { DeclarativeXySeries::classBegin(); }
				void componentComplete() { DeclarativeXySeries::componentComplete(); }

				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); }
				Q_REVISION(3) Q_INVOKABLE void replace(int index, qreal newX, qreal newY) { DeclarativeXySeries::replace(index, newX, newY); }
				Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
				Q_REVISION(3) Q_INVOKABLE void remove(int index) { DeclarativeXySeries::remove(index); }
				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); }

				Q_SIGNALS:
				void countChanged(int count);
				Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
				Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
				Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);
				Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);
				Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);
				Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);
				Q_REVISION(1) void widthChanged(qreal width);
				Q_REVISION(1) void styleChanged(Qt::PenStyle style);
				Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);

				public Q_SLOTS:
				static void appendDeclarativeChildren(QDECLARATIVE_LIST_PROPERTY<QObject> list, QObject element);
				void handleCountChanged(int index);

				public:
				DeclarativeAxes *m_axes;
				};

				QTCOMMERCIALCHART_END_NAMESPACE

				#endif // DECLARATIVESPLINESERIES_H