diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /plugins/declarative/declarativescatterseries.h | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'plugins/declarative/declarativescatterseries.h')
-rw-r--r-- | plugins/declarative/declarativescatterseries.h | 130 |
1 files changed, 0 insertions, 130 deletions
diff --git a/plugins/declarative/declarativescatterseries.h b/plugins/declarative/declarativescatterseries.h deleted file mode 100644 index 73b1c0c4..00000000 --- a/plugins/declarative/declarativescatterseries.h +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 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 Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise 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 "qscatterseries.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 DeclarativeScatterSeries : public QScatterSeries, 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 borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1) -#ifdef CHARTS_FOR_QUICK2 - Q_PROPERTY(QQmlListProperty<QObject> declarativeChildren READ declarativeChildren) -#else - Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren) -#endif - Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4) - Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4) - Q_CLASSINFO("DefaultProperty", "declarativeChildren") - -public: - explicit DeclarativeScatterSeries(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 borderWidth() const; - void setBorderWidth(qreal borderWidth); - QDECLARATIVE_LIST_PROPERTY<QObject> declarativeChildren(); - QString brushFilename() const; - void setBrushFilename(const QString &brushFilename); - void setBrush(const QBrush &brush); - QBrush brush() const; - -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(1) void borderWidthChanged(qreal width); - 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(4) void brushFilenameChanged(const QString &brushFilename); - Q_REVISION(4) void brushChanged(); - -public Q_SLOTS: - static void appendDeclarativeChildren(QDECLARATIVE_LIST_PROPERTY<QObject> *list, QObject *element); - void handleCountChanged(int index); - -private Q_SLOTS: - void handleBrushChanged(); - -public: - DeclarativeAxes *m_axes; - -private: - QString m_brushFilename; - QImage m_brushImage; -}; - -QTCOMMERCIALCHART_END_NAMESPACE - -#endif // DECLARATIVESCATTERSERIES_H |