HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1608:f0863591c53c

Clears the qml plugin code from legacy code

Michal Klocek -

r1608:f0863591c53c

parent child

Context file:

r1608:f0863591c53c

Collapse all files

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +1 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 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$
             **
             ****************************************************************************/
             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             import QmlCustomModel 1.0
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     id: chartView
                     title: "Top-5 car brand shares in Finland"
                     anchors.fill: parent
                     animationOptions: ChartView.SeriesAnimations
                     CategoriesAxis {
                         id: categoryAxis
                         categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                     }
                     // ...
                 //![1]
                     //![2]
                     CustomModel {
                         id: customModel
                         verticalHeaders: ["Manufacturer", "Volkswagen", "Toyota", "Ford", "Skoda", "Volvo", "Others"]
                         CustomModelElement { values: [0, "Manufacturer", 0, 1, 2, 3, 4] }
                         CustomModelElement { values: [1, "Volkswagen", 10.3, 12.0, 12.8, 13.0, 13.8] }
                         CustomModelElement { values: [2, "Toyota", 13.8, 13.5, 16.2, 13.7, 10.7] }
                         CustomModelElement { values: [3, "Ford", 6.4, 7.1, 8.9, 8.2, 8.6] }
                         CustomModelElement { values: [4, "Skoda", 4.7, 5.8, 6.9, 8.3, 8.2] }
                         CustomModelElement { values: [5, "Volvo", 7.1, 6.7, 6.5, 6.3, 7.0] }
                         CustomModelElement { values: [6, "Others", 57.7, 54.9, 48.7, 50.5, 51.7] }
                     }
                     //![2]
                     //![5]
                     BarSeries {
                         name: "Others"
                         barWidth: 0.9
                         visible: false
-                        axisX: categoryAxis
                         HBarModelMapper {
                             model: customModel
                             firstBarSetRow: 6
                             lastBarSetRow: 6
                             firstColumn: 2
                         }
                     }
                     //![5]
                     //![4]
                     LineSeries {
                         name: "Volkswagen"
-                        axisX: categoryAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 1
                             firstColumn: 2
                         }
                     }
                     //![4]
                     LineSeries {
                         name: "Toyota"
-                        axisX: categoryAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 2
                             firstColumn: 2
                         }
                     }
                     LineSeries {
                         name: "Ford"
-                        axisX: categoryAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 3
                             firstColumn: 2
                         }
                     }
                     LineSeries {
                         name: "Skoda"
-                        axisX: categoryAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 4
                             firstColumn: 2
                         }
                     }
                     LineSeries {
                         name: "Volvo"
-                        axisX: categoryAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 5
                             firstColumn: 2
                         }
                     }
                     //![3]
                     PieSeries {
                         id: pieSeries
                         size: 0.4
                         horizontalPosition: 0.7
                         verticalPosition: 0.4
                         onClicked: {
                             // Show the selection by exploding the slice
                             slice.exploded = !slice.exploded;
                             // Update the line series to show the yearly data for this slice
                             for (var i = 0; i < chartView.count; i++) {
                                 if (chartView.series(i).name == slice.label) {
                                     chartView.series(i).visible = slice.exploded;
                                 }
                             }
                         }
                     }
                     //![3]
                     VPieModelMapper {
                         series: pieSeries
                         model: customModel
                         labelsColumn: 1
                         valuesColumn: 2
                         firstRow: 1
                     }
                 }
             }

plugins/declarative/declarativeareaseries.cpp 0 -19

             /****************************************************************************
             **
             ** Copyright (C) 2012 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$
             **
             ****************************************************************************/
             #include "declarativeareaseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qxymodelmapper.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
                 QAreaSeries(parent)
             {
             }
-            void DeclarativeAreaSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis,this);
-            QAbstractAxis *DeclarativeAreaSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeAreaSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis,this);
-            QAbstractAxis *DeclarativeAreaSeries::axisY()
-                return chart()->axisY(this);
             void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries* series)
             {
                 QAreaSeries::setUpperSeries(series);
             }
             DeclarativeLineSeries* DeclarativeAreaSeries::upperSeries() const
             {
                 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
             }
             void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries* series)
             {
                 QAreaSeries::setLowerSeries(series);
             }
             DeclarativeLineSeries* DeclarativeAreaSeries::lowerSeries() const
             {
                 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
             }
             #include "moc_declarativeareaseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativeareaseries.h 0 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 DECLARATIVEAREASERIES_H
             #define DECLARATIVEAREASERIES_H
             #include "qchartglobal.h"
             #include "qareaseries.h"
             #include "declarativelineseries.h"
             #include "qabstractaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeAreaSeries : public QAreaSeries
             {
                 Q_OBJECT
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
                 Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
             public:
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 explicit DeclarativeAreaSeries(QObject *parent = 0);
                 void setUpperSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* upperSeries() const;
                 void setLowerSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* lowerSeries() const;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEAREASERIES_H

plugins/declarative/declarativebarseries.h 0 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 DECLARATIVEBARSERIES_H
             #define DECLARATIVEBARSERIES_H
             #include "qchartglobal.h"
             #include "qabstractbarseries.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qbarset.h"
             #include "qabstractaxis.h"
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativeBarSet : public QBarSet
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
                 Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
                 Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
                 Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
             private Q_SLOTS:
                 void handleCountChanged(int index, int count);
             };
             class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativeStackedBarSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativePercentBarSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

plugins/declarative/declarativelineseries.cpp 0 -20

             /****************************************************************************
             **
             ** Copyright (C) 2012 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$
             **
             ****************************************************************************/
             #include "declarativelineseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qlineseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) :
                 QLineSeries(parent)
             {
                 connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
             }
             QXYSeries *DeclarativeLineSeries::xySeries()
             {
                 return this;
             }
-            void DeclarativeLineSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis,this);
-            QAbstractAxis *DeclarativeLineSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeLineSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis,this);
-            QAbstractAxis *DeclarativeLineSeries::axisY()
-                return chart()->axisY(this);
             void DeclarativeLineSeries::handleCountChanged(int index)
             {
                 Q_UNUSED(index)
                 emit countChanged(points().count());
             }
             QDeclarativeListProperty<QObject> DeclarativeLineSeries::declarativeChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
             }
             void DeclarativeLineSeries::appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element)
             {
                 Q_UNUSED(list)
                 Q_UNUSED(element)
                 // Empty implementation, childs are parsed in componentComplete
             }
             #include "moc_declarativelineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativelineseries.h 0 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 DECLARATIVELINESERIES_H
             #define DECLARATIVELINESERIES_H
             #include "qchartglobal.h"
             #include "qlineseries.h"
             #include "declarativexyseries.h"
             #include "qabstractaxis.h"
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public:
                 explicit DeclarativeLineSeries(QObject *parent = 0);
                 QXYSeries *xySeries();
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 QDeclarativeListProperty<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_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 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);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleCountChanged(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVELINESERIES_H

plugins/declarative/declarativescatterseries.cpp 0 -20

             /****************************************************************************
             **
             ** Copyright (C) 2012 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$
             **
             ****************************************************************************/
             #include "declarativescatterseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qscatterseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :
                 QScatterSeries(parent)
             {
                 connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
             }
             QXYSeries *DeclarativeScatterSeries::xySeries()
             {
                 return this;
             }
-            void DeclarativeScatterSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis,this);
-            QAbstractAxis *DeclarativeScatterSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeScatterSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis,this);
-            QAbstractAxis *DeclarativeScatterSeries::axisY()
-                return chart()->axisY(this);
             void DeclarativeScatterSeries::handleCountChanged(int index)
             {
                 Q_UNUSED(index)
                 emit countChanged(QScatterSeries::count());
             }
             QDeclarativeListProperty<QObject> DeclarativeScatterSeries::declarativeChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
             }
             void DeclarativeScatterSeries::appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element)
             {
                 Q_UNUSED(list)
                 Q_UNUSED(element)
                 // Empty implementation, childs are parsed in componentComplete
             }
             #include "moc_declarativescatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativescatterseries.h 0 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 DECLARATIVESCATTERSERIES_H
             #define DECLARATIVESCATTERSERIES_H
             #include "qchartglobal.h"
             #include "qscatterseries.h"
             #include "declarativexyseries.h"
             #include "qabstractaxis.h"
             #include <QDeclarativeListProperty>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public:
                 explicit DeclarativeScatterSeries(QObject *parent = 0);
                 QXYSeries *xySeries();
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 QDeclarativeListProperty<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_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 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);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleCountChanged(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESCATTERSERIES_H

plugins/declarative/declarativesplineseries.cpp 0 -20

             /****************************************************************************
             **
             ** Copyright (C) 2012 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$
             **
             ****************************************************************************/
             #include "declarativesplineseries.h"
             #include "declarativechart.h"
             #include <QChart>
             #include "declarativexypoint.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) :
                 QSplineSeries(parent)
             {
                 connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
                 connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
             }
             QXYSeries *DeclarativeSplineSeries::xySeries()
             {
                 return this;
             }
-            void DeclarativeSplineSeries::setAxisX(QAbstractAxis *axis)
-                chart()->setAxisX(axis,this);
-            QAbstractAxis *DeclarativeSplineSeries::axisX()
-                return chart()->axisX(this);
-            void DeclarativeSplineSeries::setAxisY(QAbstractAxis *axis)
-                chart()->setAxisY(axis,this);
-            QAbstractAxis *DeclarativeSplineSeries::axisY()
-                return chart()->axisY(this);
             void DeclarativeSplineSeries::handleCountChanged(int index)
             {
                 Q_UNUSED(index)
                 emit countChanged(points().count());
             }
             QDeclarativeListProperty<QObject> DeclarativeSplineSeries::declarativeChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
             }
             void DeclarativeSplineSeries::appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element)
             {
                 Q_UNUSED(list)
                 Q_UNUSED(element)
                 // Empty implementation, childs are parsed in componentComplete
             }
             #include "moc_declarativesplineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativesplineseries.h 0 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 "qchartglobal.h"
             #include "qsplineseries.h"
             #include "declarativexyseries.h"
             #include "qabstractaxis.h"
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             public:
                 explicit DeclarativeSplineSeries(QObject *parent = 0);
                 QXYSeries *xySeries();
-                void setAxisX(QAbstractAxis *axis);
-                QAbstractAxis *axisX();
-                void setAxisY(QAbstractAxis *axis);
-                QAbstractAxis *axisY();
                 QDeclarativeListProperty<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_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 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);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleCountChanged(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESPLINESERIES_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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