##// END OF EJS Templates
Removed some carbage from pie series public APIs
Removed some carbage from pie series public APIs

File last commit:

r1904:966b9cf96344
r2044:76eebf503401
Show More
declarativebarseries.h
308 lines | 12.3 KiB | text/x-c | CLexer
Jani Honkonen
Add/modify license headers
r830 /****************************************************************************
**
** 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$
**
****************************************************************************/
Tero Ahola
Added QML api for bar series
r646 #ifndef DECLARATIVEBARSERIES_H
#define DECLARATIVEBARSERIES_H
sauimone
GroupedBarSeries to BarSeries
r1594 #include "qbarseries.h"
Tero Ahola
Added value and category axis to QML api
r1550 #include "qstackedbarseries.h"
#include "qpercentbarseries.h"
sauimone
declarative series for horizontal barcharts
r1806 #include "qhorizontalbarseries.h"
#include "qhorizontalstackedbarseries.h"
#include "qhorizontalpercentbarseries.h"
Tero Ahola
Added value and category axis to QML api
r1550 #include "qbarset.h"
Tero Ahola
Added stacked and percent bar series to QML api
r1318 #include <QDeclarativeItem>
#include <QDeclarativeParserStatus>
Tero Ahola
Added QML api for bar series
r646
QTCOMMERCIALCHART_BEGIN_NAMESPACE
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)
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);
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);
Tero Ahola
Property notifications: axis minmax, bar properties, xyseries p-visibl and count
r1465
private Q_SLOTS:
void handleCountChanged(int index, int count);
Tero Ahola
Added declarative model for bar series
r1162 };
sauimone
GroupedBarSeries to BarSeries
r1594 class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
Tero Ahola
Cleaning up declarative implementation
r1211 {
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
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
Bar model mapper to Qml custom model demo
r1313 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
Q_CLASSINFO("DefaultProperty", "seriesChildren")
Tero Ahola
Cleaning up declarative implementation
r1211
public:
sauimone
GroupedBarSeries to BarSeries
r1594 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
Tero Ahola
Refactored QML axis handling
r1813 QAbstractAxis *axisX() { return m_axisX; }
void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
QAbstractAxis *axisY() { return m_axisY; }
void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
Tero Ahola
Bar model mapper to Qml custom model demo
r1313 QDeclarativeListProperty<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
Refactored QML axis handling
r1813
sauimone
Q_SIGNALS and Q_SLOTS
r775 public Q_SLOTS:
Tero Ahola
Bar model mapper to Qml custom model demo
r1313 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
Michal Klocek
Adds axis to qml...
r1604
private:
QAbstractAxis* m_axisX;
QAbstractAxis* m_axisY;
Tero Ahola
Added QML api for bar series
r646 };
Tero Ahola
Added stacked and percent bar series to QML api
r1318 class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
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 stacked and percent bar series to QML api
r1318 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
explicit DeclarativeStackedBarSeries(QDeclarativeItem *parent = 0);
Tero Ahola
Refactored QML axis handling
r1813 QAbstractAxis *axisX() { return m_axisX; }
void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
QAbstractAxis *axisY() { return m_axisY; }
void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
Tero Ahola
Added stacked and percent bar series to QML api
r1318 QDeclarativeListProperty<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
Refactored QML axis handling
r1813
Tero Ahola
Added stacked and percent bar series to QML api
r1318 public Q_SLOTS:
static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
Michal Klocek
Adds axis to qml...
r1604
Tero Ahola
Refactored QML axis handling
r1813 private:
QAbstractAxis* m_axisX;
QAbstractAxis* m_axisY;
Tero Ahola
Added stacked and percent bar series to QML api
r1318 };
class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
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 stacked and percent bar series to QML api
r1318 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
explicit DeclarativePercentBarSeries(QDeclarativeItem *parent = 0);
Tero Ahola
Refactored QML axis handling
r1813 QAbstractAxis *axisX() { return m_axisX; }
void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
QAbstractAxis *axisY() { return m_axisY; }
void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
Tero Ahola
Added stacked and percent bar series to QML api
r1318 QDeclarativeListProperty<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
Refactored QML axis handling
r1813
Tero Ahola
Added stacked and percent bar series to QML api
r1318 public Q_SLOTS:
static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
private:
QAbstractAxis* m_axisX;
QAbstractAxis* m_axisY;
Tero Ahola
Added stacked and percent bar series to QML api
r1318 };
sauimone
declarative series for horizontal barcharts
r1806 class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QDeclarativeParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
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)
sauimone
declarative series for horizontal barcharts
r1806 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
explicit DeclarativeHorizontalBarSeries(QDeclarativeItem *parent = 0);
Tero Ahola
Refactored QML axis handling
r1813 QAbstractAxis *axisX() { return m_axisX; }
void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
QAbstractAxis *axisY() { return m_axisY; }
void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
sauimone
declarative series for horizontal barcharts
r1806 QDeclarativeListProperty<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
Refactored QML axis handling
r1813
sauimone
declarative series for horizontal barcharts
r1806 public Q_SLOTS:
static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
private:
QAbstractAxis* m_axisX;
QAbstractAxis* m_axisY;
sauimone
declarative series for horizontal barcharts
r1806 };
class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QDeclarativeParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
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)
sauimone
declarative series for horizontal barcharts
r1806 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
explicit DeclarativeHorizontalStackedBarSeries(QDeclarativeItem *parent = 0);
Tero Ahola
Refactored QML axis handling
r1813 QAbstractAxis *axisX() { return m_axisX; }
void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
QAbstractAxis *axisY() { return m_axisY; }
void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
sauimone
declarative series for horizontal barcharts
r1806 QDeclarativeListProperty<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
Refactored QML axis handling
r1813
sauimone
declarative series for horizontal barcharts
r1806 public Q_SLOTS:
static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
private:
QAbstractAxis* m_axisX;
QAbstractAxis* m_axisY;
sauimone
declarative series for horizontal barcharts
r1806 };
class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QDeclarativeParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
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)
sauimone
declarative series for horizontal barcharts
r1806 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
Q_CLASSINFO("DefaultProperty", "seriesChildren")
public:
explicit DeclarativeHorizontalPercentBarSeries(QDeclarativeItem *parent = 0);
Tero Ahola
Refactored QML axis handling
r1813 QAbstractAxis *axisX() { return m_axisX; }
void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
QAbstractAxis *axisY() { return m_axisY; }
void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
sauimone
declarative series for horizontal barcharts
r1806 QDeclarativeListProperty<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
Refactored QML axis handling
r1813
sauimone
declarative series for horizontal barcharts
r1806 public Q_SLOTS:
static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
Tero Ahola
Refactored QML axis handling
r1813
private:
QAbstractAxis* m_axisX;
QAbstractAxis* m_axisY;
sauimone
declarative series for horizontal barcharts
r1806 };
Tero Ahola
Added QML api for bar series
r646 QTCOMMERCIALCHART_END_NAMESPACE
#endif // DECLARATIVEBARSERIES_H