diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 13:11:34 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 14:38:40 +0200 |
commit | 467e729eabece018cd42eeee0160f932983561b0 (patch) | |
tree | 4c42a1d7cfc9fe6a5cbb298a52d9b9faa29cee95 /src/datavisualization/axis/q3dabstractaxis.h | |
parent | f8f57fe64c29408a8d3c41c536639e08f84747e4 (diff) |
Rename axis classes
Moved the '3D' in axis class names so that the classes would be
in line with other '3D' classes.
Task-number: QTRD-2674
Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/axis/q3dabstractaxis.h')
-rw-r--r-- | src/datavisualization/axis/q3dabstractaxis.h | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/src/datavisualization/axis/q3dabstractaxis.h b/src/datavisualization/axis/q3dabstractaxis.h deleted file mode 100644 index 825290f5..00000000 --- a/src/datavisualization/axis/q3dabstractaxis.h +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** 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 Q3DABSTRACTAXIS_H -#define Q3DABSTRACTAXIS_H - -#include <QtDataVisualization/qdatavisualizationenums.h> -#include <QObject> -#include <QScopedPointer> -#include <QVector> -#include <QStringList> - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class Q3DAbstractAxisPrivate; - -class QT_DATAVISUALIZATION_EXPORT Q3DAbstractAxis : public QObject -{ - Q_OBJECT - Q_ENUMS(AxisOrientation) - Q_ENUMS(AxisType) - Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged) - Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged) - Q_PROPERTY(AxisOrientation orientation READ orientation NOTIFY orientationChanged) - Q_PROPERTY(AxisType type READ type CONSTANT) - Q_PROPERTY(float min READ min WRITE setMin NOTIFY minChanged) - Q_PROPERTY(float max READ max WRITE setMax NOTIFY maxChanged) - Q_PROPERTY(bool autoAdjustRange READ isAutoAdjustRange WRITE setAutoAdjustRange NOTIFY autoAdjustRangeChanged) - -public: - enum AxisOrientation { - AxisOrientationNone = 0, - AxisOrientationX = 1, - AxisOrientationY = 2, - AxisOrientationZ = 4 - }; - - enum AxisType { - AxisTypeNone = 0, - AxisTypeCategory = 1, - AxisTypeValue = 2 - //AxisTypeLogValue = 6 // inherits valueaxis (4 + 2) // TODO - }; - -protected: - explicit Q3DAbstractAxis(Q3DAbstractAxisPrivate *d, QObject *parent = 0); - -public: - virtual ~Q3DAbstractAxis(); - - void setTitle(QString title); - QString title() const; - - void setLabels(const QStringList &labels); - QStringList labels() const; - - AxisOrientation orientation() const; - AxisType type() const; - - void setMin(float min); - float min() const; - - void setMax(float max); - float max() const; - - void setAutoAdjustRange(bool autoAdjust); - bool isAutoAdjustRange() const; - - void setRange(float min, float max); - -signals: - void titleChanged(QString newTitle); - void labelsChanged(); - void orientationChanged(AxisOrientation orientation); - void minChanged(float value); - void maxChanged(float value); - void rangeChanged(float min, float max); - void autoAdjustRangeChanged(bool autoAdjust); - -protected: - QScopedPointer<Q3DAbstractAxisPrivate> d_ptr; - -private: - Q_DISABLE_COPY(Q3DAbstractAxis) - - friend class Abstract3DController; - friend class Bars3DController; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QABSTRACTAXIS_H |