summaryrefslogtreecommitdiffstats
path: root/src/chartsqml2/declarativecategoryaxis.h
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-07-01 07:10:00 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2014-10-14 13:04:52 +0300
commitc544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch)
tree7659625abb566dec55d3783ed820b928542d9b2b /src/chartsqml2/declarativecategoryaxis.h
parent76339f714f088645e911cee65bdb66055fe029aa (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 'src/chartsqml2/declarativecategoryaxis.h')
-rw-r--r--src/chartsqml2/declarativecategoryaxis.h76
1 files changed, 76 insertions, 0 deletions
diff --git a/src/chartsqml2/declarativecategoryaxis.h b/src/chartsqml2/declarativecategoryaxis.h
new file mode 100644
index 00000000..3a6dda95
--- /dev/null
+++ b/src/chartsqml2/declarativecategoryaxis.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** 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 DECLARATIVECATEGORYAXIS_H
+#define DECLARATIVECATEGORYAXIS_H
+
+#include "qcategoryaxis.h"
+
+#include <QtQml/QQmlListProperty>
+#include <QtQml/QQmlParserStatus>
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+class DeclarativeCategoryRange : public QObject
+{
+ Q_OBJECT
+ Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue)
+ Q_PROPERTY(QString label READ label WRITE setLabel)
+
+public:
+ explicit DeclarativeCategoryRange(QObject *parent = 0);
+ qreal endValue() { return m_endValue; }
+ void setEndValue(qreal endValue) { m_endValue = endValue; }
+ QString label() { return m_label; }
+ void setLabel(QString label) { m_label = label; }
+
+private:
+ qreal m_endValue;
+ QString m_label;
+};
+
+class DeclarativeCategoryAxis : public QCategoryAxis, public QQmlParserStatus
+{
+ Q_OBJECT
+ Q_INTERFACES(QQmlParserStatus)
+ Q_PROPERTY(QQmlListProperty<QObject> axisChildren READ axisChildren)
+ Q_CLASSINFO("DefaultProperty", "axisChildren")
+
+public:
+ explicit DeclarativeCategoryAxis(QObject *parent = 0);
+ QQmlListProperty<QObject> axisChildren();
+
+public: // from QDeclarativeParserStatus
+ void classBegin();
+ void componentComplete();
+
+public Q_SLOTS:
+ Q_INVOKABLE void append(const QString &label, qreal categoryEndValue);
+ Q_INVOKABLE void remove(const QString &label);
+ Q_INVOKABLE void replace(const QString &oldLabel, const QString &newLabel);
+ static void appendAxisChildren(QQmlListProperty<QObject> *list, QObject *element);
+
+private:
+ static bool endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2);
+};
+
+QT_CHARTS_END_NAMESPACE
+
+#endif // DECLARATIVECATEGORYAXIS_H