##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.7' into dev...
Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I3f2ec8fb552bbed786cb0f7f5a0433d2d15f1931

File last commit:

r2854:46147b040d06
r2879:d27b6b26880d merge
Show More
declarativebarseries.h
370 lines | 16.4 KiB | text/x-c | CLexer
/ src / chartsqml2 / declarativebarseries.h
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
Added QML api for bar series
r646 #ifndef DECLARATIVEBARSERIES_H
#define DECLARATIVEBARSERIES_H
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QBarSeries>
#include <QtCharts/QStackedBarSeries>
#include <QtCharts/QPercentBarSeries>
#include <QtCharts/QHorizontalBarSeries>
#include <QtCharts/QHorizontalStackedBarSeries>
#include <QtCharts/QHorizontalPercentBarSeries>
#include <QtCharts/QBarSet>
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 <QtQuick/QQuickItem>
#include <QtQml/QQmlParserStatus>
Tero Ahola
Added QML api for bar series
r646
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola
Added QML api for bar series
r646
class QChart;
Tero Ahola
Added declarative model for bar series
r1162 class DeclarativeBarSet : public QBarSet
Tero Ahola
Added QML api for bar series
r646 {
Q_OBJECT
Tero Ahola
Added declarative model for bar series
r1162 Q_PROPERTY(QVariantList values READ values WRITE setValues)
Tero Ahola
Adding missing QML series API line/border properties
r1904 Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
Tero Ahola
Property notifications: axis minmax, bar properties, xyseries p-visibl and count
r1465 Q_PROPERTY(int count READ count NOTIFY countChanged)
Titta Heikkala
Add possibility to set brush image via QML API...
r2681 Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 2)
Tero Ahola
Added declarative model for bar series
r1162
public:
explicit DeclarativeBarSet(QObject *parent = 0);
QVariantList values();
void setValues(QVariantList values);
Tero Ahola
Adding missing QML series API line/border properties
r1904 qreal borderWidth() const;
void setBorderWidth(qreal borderWidth);
Titta Heikkala
Add possibility to set brush image via QML API...
r2681 QString brushFilename() const;
void setBrushFilename(const QString &brushFilename);
Tero Ahola
QML weather example to use data API instead of model
r1222
public: // From QBarSet
Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
sauimone
barset: removed boolean return value from remove(index,count) function
r1514 Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
Tero Ahola
QML BarSet data manipulation
r1513 Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
sauimone
Removed QPointF from QBarSet
r1580 Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
Tero Ahola
Property notifications: axis minmax, bar properties, xyseries p-visibl and count
r1465
Q_SIGNALS:
void countChanged(int count);
Tero Ahola
Adding missing QML series API line/border properties
r1904 Q_REVISION(1) void borderWidthChanged(qreal width);
Titta Heikkala
Add possibility to set brush image via QML API...
r2681 Q_REVISION(2) void brushFilenameChanged(const QString &brushFilename);
Tero Ahola
Property notifications: axis minmax, bar properties, xyseries p-visibl and count
r1465
private Q_SLOTS:
void handleCountChanged(int index, int count);
Titta Heikkala
Add possibility to set brush image via QML API...
r2681 void handleBrushChanged();
private:
QString m_brushFilename;
QImage m_brushImage;
Tero Ahola
Added declarative model for bar series
r1162 };
Titta Heikkala
Qt Charts project file structure change...
r2712 class DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus
Tero Ahola
Cleaning up declarative implementation
r1211 {
Q_OBJECT
Miikka Heikkinen
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_INTERFACES(QQmlParserStatus)
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
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
Tero Ahola
Bar model mapper to Qml custom model demo
r1313 Q_CLASSINFO("DefaultProperty", "seriesChildren")
Tero Ahola
Cleaning up declarative implementation
r1211
public:
Titta Heikkala
Qt Charts project file structure change...
r2712 explicit DeclarativeBarSeries(QQuickItem *parent = 0);
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); }
Miikka Heikkinen
Removed unnecessary Q_REVISION(n) macros....
r2717 QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> seriesChildren();
Tero Ahola
Refactored QML axis handling
r1813
public:
Tero Ahola
Color properties to QML BarSet API
r1302 Q_INVOKABLE DeclarativeBarSet *at(int index);
Tero Ahola
Implemented BarSeries::append, insert, remove and clear to QML API
r1511 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
sauimone
GroupedBarSeries to BarSeries
r1594 Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
Q_INVOKABLE void clear() { return QBarSeries::clear(); }
Tero Ahola
Color properties to QML BarSet API
r1302
Tero Ahola
Cleaning up declarative implementation
r1211 public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
Tero Ahola
Refactored QML axis handling
r1813 Q_SIGNALS:
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);
Tero Ahola
Refactored QML axis handling
r1813
sauimone
Q_SIGNALS and Q_SLOTS
r775 public Q_SLOTS:
Titta Heikkala
Qt Charts project file structure change...
r2712 static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
Michal Klocek
Adds axis to qml...
r1604
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 public:
DeclarativeAxes *m_axes;
Tero Ahola
Added QML api for bar series
r646 };
Titta Heikkala
Qt Charts project file structure change...
r2712 class DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus
Tero Ahola
Added stacked and percent bar series to QML api
r1318 {
Q_OBJECT
Miikka Heikkinen
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_INTERFACES(QQmlParserStatus)
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
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
Tero Ahola
Added stacked and percent bar series to QML api
r1318 Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
Titta Heikkala
Qt Charts project file structure change...
r2712 explicit DeclarativeStackedBarSeries(QQuickItem *parent = 0);
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); }
Miikka Heikkinen
Removed unnecessary Q_REVISION(n) macros....
r2717 QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> seriesChildren();
Tero Ahola
Refactored QML axis handling
r1813
public:
Tero Ahola
Added stacked and percent bar series to QML api
r1318 Q_INVOKABLE DeclarativeBarSet *at(int index);
Tero Ahola
Implemented BarSeries::append, insert, remove and clear to QML API
r1511 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(); }
Tero Ahola
Added stacked and percent bar series to QML api
r1318
public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
Tero Ahola
Refactored QML axis handling
r1813 Q_SIGNALS:
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);
Tero Ahola
Refactored QML axis handling
r1813
Tero Ahola
Added stacked and percent bar series to QML api
r1318 public Q_SLOTS:
Titta Heikkala
Qt Charts project file structure change...
r2712 static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
Michal Klocek
Adds axis to qml...
r1604
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 public:
DeclarativeAxes *m_axes;
Tero Ahola
Added stacked and percent bar series to QML api
r1318 };
Titta Heikkala
Qt Charts project file structure change...
r2712 class DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus
Tero Ahola
Added stacked and percent bar series to QML api
r1318 {
Q_OBJECT
Miikka Heikkinen
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_INTERFACES(QQmlParserStatus)
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
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
Tero Ahola
Added stacked and percent bar series to QML api
r1318 Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
Titta Heikkala
Qt Charts project file structure change...
r2712 explicit DeclarativePercentBarSeries(QQuickItem *parent = 0);
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); }
Miikka Heikkinen
Removed unnecessary Q_REVISION(n) macros....
r2717 QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> seriesChildren();
Tero Ahola
Refactored QML axis handling
r1813
public:
Tero Ahola
Added stacked and percent bar series to QML api
r1318 Q_INVOKABLE DeclarativeBarSet *at(int index);
Tero Ahola
Implemented BarSeries::append, insert, remove and clear to QML API
r1511 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(); }
Tero Ahola
Added stacked and percent bar series to QML api
r1318
public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
Tero Ahola
Refactored QML axis handling
r1813 Q_SIGNALS:
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);
Tero Ahola
Refactored QML axis handling
r1813
Tero Ahola
Added stacked and percent bar series to QML api
r1318 public Q_SLOTS:
Titta Heikkala
Qt Charts project file structure change...
r2712 static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 public:
DeclarativeAxes *m_axes;
Tero Ahola
Added stacked and percent bar series to QML api
r1318 };
Titta Heikkala
Qt Charts project file structure change...
r2712 class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus
sauimone
declarative series for horizontal barcharts
r1806 {
Q_OBJECT
Miikka Heikkinen
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_INTERFACES(QQmlParserStatus)
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
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
sauimone
declarative series for horizontal barcharts
r1806 Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
Titta Heikkala
Qt Charts project file structure change...
r2712 explicit DeclarativeHorizontalBarSeries(QQuickItem *parent = 0);
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); }
Miikka Heikkinen
Removed unnecessary Q_REVISION(n) macros....
r2717 QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> seriesChildren();
Tero Ahola
Refactored QML axis handling
r1813
public:
sauimone
declarative series for horizontal barcharts
r1806 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 QHorizontalBarSeries::remove(barset); }
Q_INVOKABLE void clear() { return QHorizontalBarSeries::clear(); }
public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
Tero Ahola
Refactored QML axis handling
r1813 Q_SIGNALS:
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);
Tero Ahola
Refactored QML axis handling
r1813
sauimone
declarative series for horizontal barcharts
r1806 public Q_SLOTS:
Titta Heikkala
Qt Charts project file structure change...
r2712 static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 public:
DeclarativeAxes *m_axes;
sauimone
declarative series for horizontal barcharts
r1806 };
Titta Heikkala
Qt Charts project file structure change...
r2712 class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus
sauimone
declarative series for horizontal barcharts
r1806 {
Q_OBJECT
Miikka Heikkinen
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_INTERFACES(QQmlParserStatus)
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
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
sauimone
declarative series for horizontal barcharts
r1806 Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
Titta Heikkala
Qt Charts project file structure change...
r2712 explicit DeclarativeHorizontalStackedBarSeries(QQuickItem *parent = 0);
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); }
Miikka Heikkinen
Removed unnecessary Q_REVISION(n) macros....
r2717 QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> seriesChildren();
Tero Ahola
Refactored QML axis handling
r1813
public:
sauimone
declarative series for horizontal barcharts
r1806 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 QHorizontalStackedBarSeries::remove(barset); }
Q_INVOKABLE void clear() { return QHorizontalStackedBarSeries::clear(); }
public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
Tero Ahola
Refactored QML axis handling
r1813 Q_SIGNALS:
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);
Tero Ahola
Refactored QML axis handling
r1813
sauimone
declarative series for horizontal barcharts
r1806 public Q_SLOTS:
Titta Heikkala
Qt Charts project file structure change...
r2712 static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 public:
DeclarativeAxes *m_axes;
sauimone
declarative series for horizontal barcharts
r1806 };
Titta Heikkala
Qt Charts project file structure change...
r2712 class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus
sauimone
declarative series for horizontal barcharts
r1806 {
Q_OBJECT
Miikka Heikkinen
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_INTERFACES(QQmlParserStatus)
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
Generate charts plugin for QtQuick2 as well as QtQuick1...
r2488 Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
sauimone
declarative series for horizontal barcharts
r1806 Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
Titta Heikkala
Qt Charts project file structure change...
r2712 explicit DeclarativeHorizontalPercentBarSeries(QQuickItem *parent = 0);
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); }
Miikka Heikkinen
Removed unnecessary Q_REVISION(n) macros....
r2717 QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> seriesChildren();
Tero Ahola
Refactored QML axis handling
r1813
public:
sauimone
declarative series for horizontal barcharts
r1806 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 QHorizontalPercentBarSeries::remove(barset); }
Q_INVOKABLE void clear() { return QHorizontalPercentBarSeries::clear(); }
public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
Tero Ahola
Refactored QML axis handling
r1813 Q_SIGNALS:
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);
Tero Ahola
Refactored QML axis handling
r1813
sauimone
declarative series for horizontal barcharts
r1806 public Q_SLOTS:
Titta Heikkala
Qt Charts project file structure change...
r2712 static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 public:
DeclarativeAxes *m_axes;
sauimone
declarative series for horizontal barcharts
r1806 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Tero Ahola
Added QML api for bar series
r646
#endif // DECLARATIVEBARSERIES_H