diff options
Diffstat (limited to 'src/datavisualization/axis')
| -rw-r--r-- | src/datavisualization/axis/axis.pri | 18 | ||||
| -rw-r--r-- | src/datavisualization/axis/qabstract3daxis.cpp (renamed from src/datavisualization/axis/q3dabstractaxis.cpp) | 105 | ||||
| -rw-r--r-- | src/datavisualization/axis/qabstract3daxis.h (renamed from src/datavisualization/axis/q3dabstractaxis.h) | 28 | ||||
| -rw-r--r-- | src/datavisualization/axis/qabstract3daxis_p.h (renamed from src/datavisualization/axis/q3dabstractaxis_p.h) | 34 | ||||
| -rw-r--r-- | src/datavisualization/axis/qcategory3daxis.cpp (renamed from src/datavisualization/axis/q3dcategoryaxis.cpp) | 64 | ||||
| -rw-r--r-- | src/datavisualization/axis/qcategory3daxis.h (renamed from src/datavisualization/axis/q3dcategoryaxis.h) | 26 | ||||
| -rw-r--r-- | src/datavisualization/axis/qcategory3daxis_p.h (renamed from src/datavisualization/axis/q3dcategoryaxis_p.h) | 26 | ||||
| -rw-r--r-- | src/datavisualization/axis/qvalue3daxis.cpp (renamed from src/datavisualization/axis/q3dvalueaxis.cpp) | 80 | ||||
| -rw-r--r-- | src/datavisualization/axis/qvalue3daxis.h (renamed from src/datavisualization/axis/q3dvalueaxis.h) | 35 | ||||
| -rw-r--r-- | src/datavisualization/axis/qvalue3daxis_p.h (renamed from src/datavisualization/axis/q3dvalueaxis_p.h) | 26 |
10 files changed, 219 insertions, 223 deletions
diff --git a/src/datavisualization/axis/axis.pri b/src/datavisualization/axis/axis.pri index 4e96618b..2c8bf70e 100644 --- a/src/datavisualization/axis/axis.pri +++ b/src/datavisualization/axis/axis.pri @@ -1,12 +1,12 @@ HEADERS += \ - $$PWD/q3dabstractaxis.h \ - $$PWD/q3dabstractaxis_p.h \ - $$PWD/q3dvalueaxis.h \ - $$PWD/q3dvalueaxis_p.h \ - $$PWD/q3dcategoryaxis.h \ - $$PWD/q3dcategoryaxis_p.h + $$PWD/qabstract3daxis.h \ + $$PWD/qabstract3daxis_p.h \ + $$PWD/qvalue3daxis.h \ + $$PWD/qvalue3daxis_p.h \ + $$PWD/qcategory3daxis.h \ + $$PWD/qcategory3daxis_p.h SOURCES += \ - $$PWD/q3dabstractaxis.cpp \ - $$PWD/q3dvalueaxis.cpp \ - $$PWD/q3dcategoryaxis.cpp + $$PWD/qabstract3daxis.cpp \ + $$PWD/qvalue3daxis.cpp \ + $$PWD/qcategory3daxis.cpp diff --git a/src/datavisualization/axis/q3dabstractaxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp index 0b284947..2ee7a25d 100644 --- a/src/datavisualization/axis/q3dabstractaxis.cpp +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,20 +16,20 @@ ** ****************************************************************************/ -#include "q3dabstractaxis.h" -#include "q3dabstractaxis_p.h" +#include "qabstract3daxis.h" +#include "qabstract3daxis_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class Q3DAbstractAxis + * \class QAbstract3DAxis * \inmodule QtDataVisualization - * \brief Q3DAbstractAxis is base class for axes of a graph. + * \brief QAbstract3DAxis is base class for axes of a graph. * \since Qt Data Visualization 1.0 * * You should not need to use this class directly, but one of its subclasses instead. * - * \sa Q3DCategoryAxis, Q3DValueAxis + * \sa QCategory3DAxis, QValue3DAxis */ /*! @@ -37,10 +37,12 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DAbstractAxis + * \instantiates QAbstract3DAxis * \brief AbstractAxis3D is base type for axes of a graph. * * This type is uncreatable, but contains properties that are exposed via subtypes. + * + * For AbstractAxis3D enums, see \l QAbstract3DAxis::AxisOrientation and \l QAbstract3DAxis::AxisType */ /*! @@ -88,7 +90,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! - * \enum Q3DAbstractAxis::AxisOrientation + * \enum QAbstract3DAxis::AxisOrientation * * The orientation of the axis object. * @@ -99,7 +101,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! - * \enum Q3DAbstractAxis::AxisType + * \enum QAbstract3DAxis::AxisType * * The type of the axis object. * @@ -111,45 +113,45 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE /*! * \internal */ -Q3DAbstractAxis::Q3DAbstractAxis(Q3DAbstractAxisPrivate *d, QObject *parent) : +QAbstract3DAxis::QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent) : QObject(parent), d_ptr(d) { } /*! - * Destroys Q3DAbstractAxis. + * Destroys QAbstract3DAxis. */ -Q3DAbstractAxis::~Q3DAbstractAxis() +QAbstract3DAxis::~QAbstract3DAxis() { } /*! - * \property Q3DAbstractAxis::orientation + * \property QAbstract3DAxis::orientation * - * Defines the orientation of the axis, one of \c Q3DAbstractAxis::AxisOrientation. + * Defines the orientation of the axis, one of \c QAbstract3DAxis::AxisOrientation. */ -Q3DAbstractAxis::AxisOrientation Q3DAbstractAxis::orientation() const +QAbstract3DAxis::AxisOrientation QAbstract3DAxis::orientation() const { return d_ptr->m_orientation; } /*! - * \property Q3DAbstractAxis::type + * \property QAbstract3DAxis::type * - * Defines the type of the axis, one of \c Q3DAbstractAxis::AxisType. + * Defines the type of the axis, one of \c QAbstract3DAxis::AxisType. */ -Q3DAbstractAxis::AxisType Q3DAbstractAxis::type() const +QAbstract3DAxis::AxisType QAbstract3DAxis::type() const { return d_ptr->m_type; } /*! - * \property Q3DAbstractAxis::title + * \property QAbstract3DAxis::title * * Defines the title for the axis. */ -void Q3DAbstractAxis::setTitle(QString title) +void QAbstract3DAxis::setTitle(QString title) { if (d_ptr->m_title != title) { d_ptr->m_title = title; @@ -157,23 +159,23 @@ void Q3DAbstractAxis::setTitle(QString title) } } -QString Q3DAbstractAxis::title() const +QString QAbstract3DAxis::title() const { return d_ptr->m_title; } /*! - * \property Q3DAbstractAxis::labels + * \property QAbstract3DAxis::labels * * Defines the labels for the axis. - * \note Setting this property for Q3DValueAxis does nothing, as it generates labels automatically. + * \note Setting this property for QValue3DAxis does nothing, as it generates labels automatically. */ -void Q3DAbstractAxis::setLabels(const QStringList &labels) +void QAbstract3DAxis::setLabels(const QStringList &labels) { Q_UNUSED(labels) } -QStringList Q3DAbstractAxis::labels() const +QStringList QAbstract3DAxis::labels() const { d_ptr->updateLabels(); return d_ptr->m_labels; @@ -182,60 +184,60 @@ QStringList Q3DAbstractAxis::labels() const /*! * Sets value range of the axis from \a min to \a max. * When setting the range, the max is adjusted if necessary, to ensure that the range remains valid. - * \note For Q3DCategoryAxis this specifies the index range of rows or columns to show. + * \note For QCategory3DAxis this specifies the index range of rows or columns to show. */ -void Q3DAbstractAxis::setRange(float min, float max) +void QAbstract3DAxis::setRange(float min, float max) { d_ptr->setRange(min, max); setAutoAdjustRange(false); } /*! - * \property Q3DAbstractAxis::min + * \property QAbstract3DAxis::min * * Defines the minimum value on the axis. * When setting this property the max is adjusted if necessary, to ensure that the range remains * valid. - * \note For Q3DCategoryAxis this specifies the index of the first row or column to show. + * \note For QCategory3DAxis this specifies the index of the first row or column to show. */ -void Q3DAbstractAxis::setMin(float min) +void QAbstract3DAxis::setMin(float min) { d_ptr->setMin(min); setAutoAdjustRange(false); } /*! - * \property Q3DAbstractAxis::max + * \property QAbstract3DAxis::max * * Defines the maximum value on the axis. * When setting this property the min is adjusted if necessary, to ensure that the range remains * valid. - * \note For Q3DCategoryAxis this specifies the index of the last row or column to show. + * \note For QCategory3DAxis this specifies the index of the last row or column to show. */ -void Q3DAbstractAxis::setMax(float max) +void QAbstract3DAxis::setMax(float max) { d_ptr->setMax(max); setAutoAdjustRange(false); } -float Q3DAbstractAxis::min() const +float QAbstract3DAxis::min() const { return d_ptr->m_min; } -float Q3DAbstractAxis::max() const +float QAbstract3DAxis::max() const { return d_ptr->m_max; } /*! - * \property Q3DAbstractAxis::autoAdjustRange + * \property QAbstract3DAxis::autoAdjustRange * * If set, the axis will automatically adjust the range so that all data fits in it. * * \sa setRange(), setMin(), setMax() */ -void Q3DAbstractAxis::setAutoAdjustRange(bool autoAdjust) +void QAbstract3DAxis::setAutoAdjustRange(bool autoAdjust) { if (d_ptr->m_autoAdjust != autoAdjust) { d_ptr->m_autoAdjust = autoAdjust; @@ -243,23 +245,22 @@ void Q3DAbstractAxis::setAutoAdjustRange(bool autoAdjust) } } -bool Q3DAbstractAxis::isAutoAdjustRange() const +bool QAbstract3DAxis::isAutoAdjustRange() const { return d_ptr->m_autoAdjust; } /*! - * \fn Q3DAbstractAxis::rangeChanged(float min, float max) + * \fn QAbstract3DAxis::rangeChanged(float min, float max) * * Emits range \a min and \a max values when range changes. */ -// Q3DAbstractAxisPrivate - -Q3DAbstractAxisPrivate::Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAxis::AxisType type) +// QAbstract3DAxisPrivate +QAbstract3DAxisPrivate::QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type) : QObject(0), q_ptr(q), - m_orientation(Q3DAbstractAxis::AxisOrientationNone), + m_orientation(QAbstract3DAxis::AxisOrientationNone), m_type(type), m_isDefaultAxis(false), m_min(0.0f), @@ -270,13 +271,13 @@ Q3DAbstractAxisPrivate::Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAx { } -Q3DAbstractAxisPrivate::~Q3DAbstractAxisPrivate() +QAbstract3DAxisPrivate::~QAbstract3DAxisPrivate() { } -void Q3DAbstractAxisPrivate::setOrientation(Q3DAbstractAxis::AxisOrientation orientation) +void QAbstract3DAxisPrivate::setOrientation(QAbstract3DAxis::AxisOrientation orientation) { - if (m_orientation == Q3DAbstractAxis::AxisOrientationNone) { + if (m_orientation == QAbstract3DAxis::AxisOrientationNone) { m_orientation = orientation; emit q_ptr->orientationChanged(orientation); } else { @@ -284,12 +285,12 @@ void Q3DAbstractAxisPrivate::setOrientation(Q3DAbstractAxis::AxisOrientation ori } } -void Q3DAbstractAxisPrivate::updateLabels() +void QAbstract3DAxisPrivate::updateLabels() { // Default implementation does nothing } -void Q3DAbstractAxisPrivate::setRange(float min, float max) +void QAbstract3DAxisPrivate::setRange(float min, float max) { bool adjusted = false; if (m_onlyPositiveValues) { @@ -336,7 +337,7 @@ void Q3DAbstractAxisPrivate::setRange(float min, float max) emit q_ptr->maxChanged(m_max); } -void Q3DAbstractAxisPrivate::setMin(float min) +void QAbstract3DAxisPrivate::setMin(float min) { if (m_onlyPositiveValues) { if (min < 0.0f) { @@ -365,7 +366,7 @@ void Q3DAbstractAxisPrivate::setMin(float min) } } -void Q3DAbstractAxisPrivate::setMax(float max) +void QAbstract3DAxisPrivate::setMax(float max) { if (m_onlyPositiveValues) { if (max < 0.0f) { @@ -401,4 +402,4 @@ void Q3DAbstractAxisPrivate::setMax(float max) } } -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/axis/q3dabstractaxis.h b/src/datavisualization/axis/qabstract3daxis.h index 825290f5..28b93f36 100644 --- a/src/datavisualization/axis/q3dabstractaxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,20 +16,21 @@ ** ****************************************************************************/ -#ifndef Q3DABSTRACTAXIS_H -#define Q3DABSTRACTAXIS_H +#ifndef QABSTRACT3DAXIS_H +#define QABSTRACT3DAXIS_H + +#include <QtDataVisualization/qdatavisualizationglobal.h> -#include <QtDataVisualization/qdatavisualizationenums.h> #include <QObject> #include <QScopedPointer> #include <QVector> #include <QStringList> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Q3DAbstractAxisPrivate; +class QAbstract3DAxisPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DAbstractAxis : public QObject +class QT_DATAVISUALIZATION_EXPORT QAbstract3DAxis : public QObject { Q_OBJECT Q_ENUMS(AxisOrientation) @@ -54,14 +55,13 @@ public: AxisTypeNone = 0, AxisTypeCategory = 1, AxisTypeValue = 2 - //AxisTypeLogValue = 6 // inherits valueaxis (4 + 2) // TODO }; protected: - explicit Q3DAbstractAxis(Q3DAbstractAxisPrivate *d, QObject *parent = 0); + explicit QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent = 0); public: - virtual ~Q3DAbstractAxis(); + virtual ~QAbstract3DAxis(); void setTitle(QString title); QString title() const; @@ -93,15 +93,15 @@ signals: void autoAdjustRangeChanged(bool autoAdjust); protected: - QScopedPointer<Q3DAbstractAxisPrivate> d_ptr; + QScopedPointer<QAbstract3DAxisPrivate> d_ptr; private: - Q_DISABLE_COPY(Q3DAbstractAxis) + Q_DISABLE_COPY(QAbstract3DAxis) friend class Abstract3DController; friend class Bars3DController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QABSTRACTAXIS_H +#endif diff --git a/src/datavisualization/axis/q3dabstractaxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h index 3293e41e..4eb8de68 100644 --- a/src/datavisualization/axis/q3dabstractaxis_p.h +++ b/src/datavisualization/axis/qabstract3daxis_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -27,22 +27,22 @@ // We mean it. #include "datavisualizationglobal_p.h" -#include "q3dabstractaxis.h" +#include "qabstract3daxis.h" #include "abstract3dcontroller_p.h" -#ifndef Q3DABSTRACTAXIS_P_H -#define Q3DABSTRACTAXIS_P_H +#ifndef QABSTRACT3DAXIS_P_H +#define QABSTRACT3DAXIS_P_H -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Q3DAbstractAxisPrivate : public QObject +class QAbstract3DAxisPrivate : public QObject { Q_OBJECT public: - Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAxis::AxisType type); - virtual ~Q3DAbstractAxisPrivate(); + QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type); + virtual ~QAbstract3DAxisPrivate(); - void setOrientation(Q3DAbstractAxis::AxisOrientation orientation); + void setOrientation(QAbstract3DAxis::AxisOrientation orientation); inline bool isDefaultAxis() { return m_isDefaultAxis; } inline void setDefaultAxis(bool isDefault) { m_isDefaultAxis = isDefault; } @@ -54,12 +54,12 @@ public: protected: virtual void updateLabels(); - Q3DAbstractAxis *q_ptr; + QAbstract3DAxis *q_ptr; QString m_title; QStringList m_labels; - Q3DAbstractAxis::AxisOrientation m_orientation; - Q3DAbstractAxis::AxisType m_type; + QAbstract3DAxis::AxisOrientation m_orientation; + QAbstract3DAxis::AxisType m_type; bool m_isDefaultAxis; float m_min; float m_max; @@ -67,11 +67,11 @@ protected: bool m_onlyPositiveValues; bool m_allowMinMaxSame; - friend class Q3DAbstractAxis; - friend class Q3DValueAxis; - friend class Q3DCategoryAxis; + friend class QAbstract3DAxis; + friend class QValue3DAxis; + friend class QCategory3DAxis; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QABSTRACTAXIS_P_H +#endif diff --git a/src/datavisualization/axis/q3dcategoryaxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp index 26a75f93..c1d5777a 100644 --- a/src/datavisualization/axis/q3dcategoryaxis.cpp +++ b/src/datavisualization/axis/qcategory3daxis.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,20 +16,20 @@ ** ****************************************************************************/ -#include "q3dcategoryaxis.h" -#include "q3dcategoryaxis_p.h" +#include "qcategory3daxis.h" +#include "qcategory3daxis_p.h" #include "bars3dcontroller_p.h" #include "qbardataproxy.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class Q3DCategoryAxis + * \class QCategory3DAxis * \inmodule QtDataVisualization - * \brief The Q3DCategoryAxis class is used for manipulating an axis of a graph. + * \brief The QCategory3DAxis class is used for manipulating an axis of a graph. * \since Qt Data Visualization 1.0 * - * Q3DCategoryAxis provides an axis that can be given labels. The axis is divided into equal-sized + * QCategory3DAxis provides an axis that can be given labels. The axis is divided into equal-sized * categories based on the data window size defined by setting the axis range. * * Grid lines are drawn between categories, if visible. Labels are drawn to positions of categories @@ -41,7 +41,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DCategoryAxis + * \instantiates QCategory3DAxis * \inherits AbstractAxis3D * \brief The CategoryAxis3D type is used for manipulating an axis of a graph. * @@ -53,44 +53,38 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * Defines labels for axis applied to categories. If there are fewer labels than categories, the * remaining ones do not have a label. If category labels are not defined explicitly, labels are - * generated from the data row (or column) labels. - * - * \note If the graph has multiple visible series and category labels are not defined explicitly, - * changing the rows (or columns) on any of the attached series will regenerate the labels. + * generated from the data row (or column) labels of the primary series of the graph. */ /*! - * Constructs Q3DCategoryAxis with \a parent. + * Constructs QCategory3DAxis with \a parent. */ -Q3DCategoryAxis::Q3DCategoryAxis(QObject *parent) : - Q3DAbstractAxis(new Q3DCategoryAxisPrivate(this), parent) +QCategory3DAxis::QCategory3DAxis(QObject *parent) : + QAbstract3DAxis(new QCategory3DAxisPrivate(this), parent) { - connect(this, &Q3DCategoryAxis::labelsChanged, this, &Q3DAbstractAxis::labelsChanged); + connect(this, &QCategory3DAxis::labelsChanged, this, &QAbstract3DAxis::labelsChanged); } /*! - * Destroys Q3DCategoryAxis. + * Destroys QCategory3DAxis. */ -Q3DCategoryAxis::~Q3DCategoryAxis() +QCategory3DAxis::~QCategory3DAxis() { } /*! - * \property Q3DCategoryAxis::labels + * \property QCategory3DAxis::labels * * Defines labels for axis applied to categories. If there are fewer labels than categories, the * remaining ones do not have a label. If category labels are not defined explicitly, labels are - * generated from the data row (or column) labels. - * - * \note If the graph has multiple visible series and category labels are not defined explicitly, - * changing the rows (or columns) on any of the attached series will regenerate the labels. + * generated from the data row (or column) labels of the primary series of the graph. */ -QStringList Q3DCategoryAxis::labels() const +QStringList QCategory3DAxis::labels() const { - return Q3DAbstractAxis::labels(); + return QAbstract3DAxis::labels(); } -void Q3DCategoryAxis::setLabels(const QStringList &labels) +void QCategory3DAxis::setLabels(const QStringList &labels) { dptr()->m_labelsExplicitlySet = !labels.isEmpty(); bool labelsFromData = false; @@ -118,20 +112,20 @@ void Q3DCategoryAxis::setLabels(const QStringList &labels) /*! * \internal */ -Q3DCategoryAxisPrivate *Q3DCategoryAxis::dptr() +QCategory3DAxisPrivate *QCategory3DAxis::dptr() { - return static_cast<Q3DCategoryAxisPrivate *>(d_ptr.data()); + return static_cast<QCategory3DAxisPrivate *>(d_ptr.data()); } -Q3DCategoryAxisPrivate::Q3DCategoryAxisPrivate(Q3DCategoryAxis *q) - : Q3DAbstractAxisPrivate(q, Q3DAbstractAxis::AxisTypeCategory), +QCategory3DAxisPrivate::QCategory3DAxisPrivate(QCategory3DAxis *q) + : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeCategory), m_labelsExplicitlySet(false) { m_onlyPositiveValues = true; m_allowMinMaxSame = true; } -Q3DCategoryAxisPrivate::~Q3DCategoryAxisPrivate() +QCategory3DAxisPrivate::~QCategory3DAxisPrivate() { } @@ -140,7 +134,7 @@ Q3DCategoryAxisPrivate::~Q3DCategoryAxisPrivate() * Controller uses this function to set labels from data proxy as category labels. * If the labels have been set explicitly by the user, data proxy labels are not used. */ -void Q3DCategoryAxisPrivate::setDataLabels(const QStringList &labels) +void QCategory3DAxisPrivate::setDataLabels(const QStringList &labels) { if (!m_labelsExplicitlySet && m_labels != labels) { m_labels = labels; @@ -148,9 +142,9 @@ void Q3DCategoryAxisPrivate::setDataLabels(const QStringList &labels) } } -Q3DCategoryAxis *Q3DCategoryAxisPrivate::qptr() +QCategory3DAxis *QCategory3DAxisPrivate::qptr() { - return static_cast<Q3DCategoryAxis *>(q_ptr); + return static_cast<QCategory3DAxis *>(q_ptr); } -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/axis/q3dcategoryaxis.h b/src/datavisualization/axis/qcategory3daxis.h index 7b2b4744..b16d0444 100644 --- a/src/datavisualization/axis/q3dcategoryaxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,23 +16,23 @@ ** ****************************************************************************/ -#ifndef Q3DCATEGORYAXIS_H -#define Q3DCATEGORYAXIS_H +#ifndef QCATEGORY3DAXIS_H +#define QCATEGORY3DAXIS_H -#include <QtDataVisualization/q3dabstractaxis.h> +#include <QtDataVisualization/qabstract3daxis.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Q3DCategoryAxisPrivate; +class QCategory3DAxisPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis +class QT_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis { Q_OBJECT Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged) public: - explicit Q3DCategoryAxis(QObject *parent = 0); - virtual ~Q3DCategoryAxis(); + explicit QCategory3DAxis(QObject *parent = 0); + virtual ~QCategory3DAxis(); void setLabels(const QStringList &labels); QStringList labels() const; @@ -41,13 +41,13 @@ signals: void labelsChanged(); protected: - Q3DCategoryAxisPrivate *dptr(); + QCategory3DAxisPrivate *dptr(); private: - Q_DISABLE_COPY(Q3DCategoryAxis) + Q_DISABLE_COPY(QCategory3DAxis) friend class Bars3DController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QCATEGORYAXIS_H +#endif diff --git a/src/datavisualization/axis/q3dcategoryaxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h index 9b66e48a..1ba5ccb0 100644 --- a/src/datavisualization/axis/q3dcategoryaxis_p.h +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -26,32 +26,32 @@ // // We mean it. -#include "q3dcategoryaxis.h" -#include "q3dabstractaxis_p.h" +#include "qcategory3daxis.h" +#include "qabstract3daxis_p.h" #include "qbardataitem.h" -#ifndef QCATEGORYAXIS_P_H -#define QCATEGORYAXIS_P_H +#ifndef QCATEGORY3DAXIS_P_H +#define QCATEGORY3DAXIS_P_H -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Q3DCategoryAxisPrivate : public Q3DAbstractAxisPrivate +class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate { Q_OBJECT public: - Q3DCategoryAxisPrivate(Q3DCategoryAxis *q); - virtual ~Q3DCategoryAxisPrivate(); + QCategory3DAxisPrivate(QCategory3DAxis *q); + virtual ~QCategory3DAxisPrivate(); void setDataLabels(const QStringList &labels); private: - Q3DCategoryAxis *qptr(); + QCategory3DAxis *qptr(); bool m_labelsExplicitlySet; - friend class Q3DCategoryAxis; + friend class QCategory3DAxis; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QCATEGORYAXIS_P_H +#endif diff --git a/src/datavisualization/axis/q3dvalueaxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp index 746c8617..52f1e599 100644 --- a/src/datavisualization/axis/q3dvalueaxis.cpp +++ b/src/datavisualization/axis/qvalue3daxis.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,19 +16,19 @@ ** ****************************************************************************/ -#include "q3dvalueaxis.h" -#include "q3dvalueaxis_p.h" +#include "qvalue3daxis.h" +#include "qvalue3daxis_p.h" #include "utils_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class Q3DValueAxis + * \class QValue3DAxis * \inmodule QtDataVisualization - * \brief The Q3DValueAxis class is used for manipulating an axis of a graph. + * \brief The QValue3DAxis class is used for manipulating an axis of a graph. * \since Qt Data Visualization 1.0 * - * Q3DValueAxis provides an axis that can be given a range of values and segment and subsegment + * QValue3DAxis provides an axis that can be given a range of values and segment and subsegment * counts to divide the range into. * * Labels are drawn between each segment. Grid lines are drawn between each segment and each @@ -41,7 +41,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DValueAxis + * \instantiates QValue3DAxis * \inherits AbstractAxis3D * \brief The ValueAxis3D type is used for manipulating an axis of a graph. * @@ -74,23 +74,23 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! - * Constructs Q3DValueAxis with the given \a parent. + * Constructs QValue3DAxis with the given \a parent. */ -Q3DValueAxis::Q3DValueAxis(QObject *parent) : - Q3DAbstractAxis(new Q3DValueAxisPrivate(this), parent) +QValue3DAxis::QValue3DAxis(QObject *parent) : + QAbstract3DAxis(new QValue3DAxisPrivate(this), parent) { } /*! - * Destroys Q3DValueAxis. + * Destroys QValue3DAxis. */ -Q3DValueAxis::~Q3DValueAxis() +QValue3DAxis::~QValue3DAxis() { } /*! - * \property Q3DValueAxis::segmentCount + * \property QValue3DAxis::segmentCount * * Defines the number of segments on the axis. This indicates how many labels are drawn. The number * of grid lines to be drawn is calculated with formula: \c {segments * subsegments + 1}. @@ -98,7 +98,7 @@ Q3DValueAxis::~Q3DValueAxis() * * \sa setSubSegmentCount() */ -void Q3DValueAxis::setSegmentCount(int count) +void QValue3DAxis::setSegmentCount(int count) { if (count <= 0) { qWarning() << "Warning: Illegal segment count automatically adjusted to a legal one:" @@ -112,13 +112,13 @@ void Q3DValueAxis::setSegmentCount(int count) } } -int Q3DValueAxis::segmentCount() const +int QValue3DAxis::segmentCount() const { return dptrc()->m_segmentCount; } /*! - * \property Q3DValueAxis::subSegmentCount + * \property QValue3DAxis::subSegmentCount * * Defines the number of subsegments inside each segment on the axis. Grid lines are drawn between * each subsegment, in addition to each segment. @@ -126,7 +126,7 @@ int Q3DValueAxis::segmentCount() const * * \sa setSegmentCount() */ -void Q3DValueAxis::setSubSegmentCount(int count) +void QValue3DAxis::setSubSegmentCount(int count) { if (count <= 0) { qWarning() << "Warning: Illegal subsegment count automatically adjusted to a legal one:" @@ -139,13 +139,13 @@ void Q3DValueAxis::setSubSegmentCount(int count) } } -int Q3DValueAxis::subSegmentCount() const +int QValue3DAxis::subSegmentCount() const { return dptrc()->m_subSegmentCount; } /*! - * \property Q3DValueAxis::labelFormat + * \property QValue3DAxis::labelFormat * * Defines the label format to be used for the labels on this axis. Supported specifiers are: * \c {d, i, o, x, X, f, F, e, E, g, G, c}. See QString::sprintf() for additional details. @@ -154,7 +154,7 @@ int Q3DValueAxis::subSegmentCount() const * * \c {axis->setLabelFormat("%.2f mm");} */ -void Q3DValueAxis::setLabelFormat(const QString &format) +void QValue3DAxis::setLabelFormat(const QString &format) { if (dptr()->m_labelFormat != format) { dptr()->m_labelFormat = format; @@ -163,7 +163,7 @@ void Q3DValueAxis::setLabelFormat(const QString &format) } } -QString Q3DValueAxis::labelFormat() const +QString QValue3DAxis::labelFormat() const { return dptrc()->m_labelFormat; } @@ -171,21 +171,21 @@ QString Q3DValueAxis::labelFormat() const /*! * \internal */ -Q3DValueAxisPrivate *Q3DValueAxis::dptr() +QValue3DAxisPrivate *QValue3DAxis::dptr() { - return static_cast<Q3DValueAxisPrivate *>(d_ptr.data()); + return static_cast<QValue3DAxisPrivate *>(d_ptr.data()); } /*! * \internal */ -const Q3DValueAxisPrivate *Q3DValueAxis::dptrc() const +const QValue3DAxisPrivate *QValue3DAxis::dptrc() const { - return static_cast<const Q3DValueAxisPrivate *>(d_ptr.data()); + return static_cast<const QValue3DAxisPrivate *>(d_ptr.data()); } -Q3DValueAxisPrivate::Q3DValueAxisPrivate(Q3DValueAxis *q) - : Q3DAbstractAxisPrivate(q, Q3DAbstractAxis::AxisTypeValue), +QValue3DAxisPrivate::QValue3DAxisPrivate(QValue3DAxis *q) + : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeValue), m_segmentCount(5), m_subSegmentCount(1), m_labelFormat(Utils::defaultLabelFormat()), @@ -193,47 +193,47 @@ Q3DValueAxisPrivate::Q3DValueAxisPrivate(Q3DValueAxis *q) { } -Q3DValueAxisPrivate::~Q3DValueAxisPrivate() +QValue3DAxisPrivate::~QValue3DAxisPrivate() { } -void Q3DValueAxisPrivate::setRange(float min, float max) +void QValue3DAxisPrivate::setRange(float min, float max) { bool dirty = (min != m_min || max != m_max); - Q3DAbstractAxisPrivate::setRange(min, max); + QAbstract3DAxisPrivate::setRange(min, max); if (dirty) emitLabelsChanged(); } -void Q3DValueAxisPrivate::setMin(float min) +void QValue3DAxisPrivate::setMin(float min) { bool dirty = (min != m_min); - Q3DAbstractAxisPrivate::setMin(min); + QAbstract3DAxisPrivate::setMin(min); if (dirty) emitLabelsChanged(); } -void Q3DValueAxisPrivate::setMax(float max) +void QValue3DAxisPrivate::setMax(float max) { bool dirty = (max != m_max); - Q3DAbstractAxisPrivate::setMax(max); + QAbstract3DAxisPrivate::setMax(max); if (dirty) emitLabelsChanged(); } -void Q3DValueAxisPrivate::emitLabelsChanged() +void QValue3DAxisPrivate::emitLabelsChanged() { m_labelsDirty = true; emit q_ptr->labelsChanged(); } -void Q3DValueAxisPrivate::updateLabels() +void QValue3DAxisPrivate::updateLabels() { if (!m_labelsDirty) return; @@ -262,9 +262,9 @@ void Q3DValueAxisPrivate::updateLabels() m_labels = newLabels; } -Q3DValueAxis *Q3DValueAxisPrivate::qptr() +QValue3DAxis *QValue3DAxisPrivate::qptr() { - return static_cast<Q3DValueAxis *>(q_ptr); + return static_cast<QValue3DAxis *>(q_ptr); } -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/axis/q3dvalueaxis.h b/src/datavisualization/axis/qvalue3daxis.h index f1280e25..c930c700 100644 --- a/src/datavisualization/axis/q3dvalueaxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,16 +16,16 @@ ** ****************************************************************************/ -#ifndef QVALUEAXIS_H -#define QVALUEAXIS_H +#ifndef QVALUE3DAXIS_H +#define QVALUE3DAXIS_H -#include <QtDataVisualization/q3dabstractaxis.h> +#include <QtDataVisualization/qabstract3daxis.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Q3DValueAxisPrivate; +class QValue3DAxisPrivate; -class QT_DATAVISUALIZATION_EXPORT Q3DValueAxis : public Q3DAbstractAxis +class QT_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis { Q_OBJECT Q_PROPERTY(int segmentCount READ segmentCount WRITE setSegmentCount NOTIFY segmentCountChanged) @@ -33,16 +33,17 @@ class QT_DATAVISUALIZATION_EXPORT Q3DValueAxis : public Q3DAbstractAxis Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) public: - explicit Q3DValueAxis(QObject *parent = 0); - virtual ~Q3DValueAxis(); + explicit QValue3DAxis(QObject *parent = 0); + virtual ~QValue3DAxis(); + void setSegmentCount(int count); int segmentCount() const; - int subSegmentCount() const; - QString labelFormat() const; - void setSegmentCount(int count); void setSubSegmentCount(int count); + int subSegmentCount() const; + void setLabelFormat(const QString &format); + QString labelFormat() const; signals: void segmentCountChanged(int count); @@ -50,16 +51,16 @@ signals: void labelFormatChanged(QString format); protected: - Q3DValueAxisPrivate *dptr(); - const Q3DValueAxisPrivate *dptrc() const; + QValue3DAxisPrivate *dptr(); + const QValue3DAxisPrivate *dptrc() const; private: - Q_DISABLE_COPY(Q3DValueAxis) + Q_DISABLE_COPY(QValue3DAxis) friend class Bars3DController; friend class Scatter3DController; friend class Surface3DController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QVALUEAXIS_H +#endif diff --git a/src/datavisualization/axis/q3dvalueaxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h index 0a98bb04..21fd78ab 100644 --- a/src/datavisualization/axis/q3dvalueaxis_p.h +++ b/src/datavisualization/axis/qvalue3daxis_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -26,21 +26,21 @@ // // We mean it. -#include "q3dvalueaxis.h" -#include "q3dabstractaxis_p.h" +#include "qvalue3daxis.h" +#include "qabstract3daxis_p.h" -#ifndef QVALUEAXIS_P_H -#define QVALUEAXIS_P_H +#ifndef QVALUE3DAXIS_P_H +#define QVALUE3DAXIS_P_H -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Q3DValueAxisPrivate : public Q3DAbstractAxisPrivate +class QValue3DAxisPrivate : public QAbstract3DAxisPrivate { Q_OBJECT public: - Q3DValueAxisPrivate(Q3DValueAxis *q); - virtual ~Q3DValueAxisPrivate(); + QValue3DAxisPrivate(QValue3DAxis *q); + virtual ~QValue3DAxisPrivate(); virtual void setRange(float min, float max); virtual void setMin(float min); @@ -56,11 +56,11 @@ protected: bool m_labelsDirty; private: - Q3DValueAxis *qptr(); + QValue3DAxis *qptr(); - friend class Q3DValueAxis; + friend class QValue3DAxis; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION -#endif // QVALUEAXIS_P_H +#endif |