diff options
author | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:50:03 +0200 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:51:20 +0200 |
commit | 07aba602fc82ac31684988f8e8e22521d2b3c982 (patch) | |
tree | 7ae1da139e8661bf157f996fe71844031d2995f4 /src/datavisualization/data/qbar3dseries.h | |
parent | cf0cf6ca67aec8ae480bb705443ea17f5ab9f9e2 (diff) | |
parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) |
Merge branch 'develop' into mergebranch
Conflicts:
examples/qmlbars/qml/qmlbars/main.qml
examples/qmlscatter/qml/qmlscatter/main.qml
examples/qmlsurface/qml/qmlsurface/main.qml
src/datavisualization/data/qitemmodelbardatamapping.cpp
src/datavisualization/data/qitemmodelscatterdatamapping.cpp
src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
src/datavisualization/engine/drawer.cpp
Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1
Diffstat (limited to 'src/datavisualization/data/qbar3dseries.h')
-rw-r--r-- | src/datavisualization/data/qbar3dseries.h | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h new file mode 100644 index 00000000..5883cbfb --- /dev/null +++ b/src/datavisualization/data/qbar3dseries.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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 QtDataVisualization module. +** +** 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 +** +****************************************************************************/ + +#ifndef QBAR3DSERIES_H +#define QBAR3DSERIES_H + +#include <QtDataVisualization/qabstract3dseries.h> +#include <QtDataVisualization/qbardataproxy.h> +#include <QPoint> + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QBar3DSeriesPrivate; + +class QT_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries +{ + Q_OBJECT + Q_PROPERTY(QBarDataProxy *dataProxy READ dataProxy WRITE setDataProxy NOTIFY dataProxyChanged) + Q_PROPERTY(QPoint selectedBar READ selectedBar WRITE setSelectedBar NOTIFY selectedBarChanged) + +public: + explicit QBar3DSeries(QObject *parent = 0); + explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = 0); + virtual ~QBar3DSeries(); + + void setDataProxy(QBarDataProxy *proxy); + QBarDataProxy *dataProxy() const; + + void setSelectedBar(const QPoint &position); + QPoint selectedBar() const; + QPoint invalidSelectionPosition() const; + +signals: + void dataProxyChanged(QBarDataProxy *proxy); + void selectedBarChanged(QPoint position); + +protected: + explicit QBar3DSeries(QBar3DSeriesPrivate *d, QObject *parent = 0); + QBar3DSeriesPrivate *dptr(); + const QBar3DSeriesPrivate *dptrc() const; + +private: + Q_DISABLE_COPY(QBar3DSeries) + + friend class Bars3DController; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif |