diff options
Diffstat (limited to 'src/datavis3d/axis')
| -rw-r--r-- | src/datavis3d/axis/axis.pri | 18 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dabstractaxis.cpp (renamed from src/datavis3d/axis/qabstractaxis.cpp) | 56 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dabstractaxis.h (renamed from src/datavis3d/axis/qabstractaxis.h) | 16 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dabstractaxis_p.h (renamed from src/datavis3d/axis/qabstractaxis_p.h) | 26 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dcategoryaxis.cpp (renamed from src/datavis3d/axis/qcategoryaxis.cpp) | 36 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dcategoryaxis.h (renamed from src/datavis3d/axis/qcategoryaxis.h) | 19 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dcategoryaxis_p.h (renamed from src/datavis3d/axis/qcategoryaxis_p.h) | 10 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dvalueaxis.cpp (renamed from src/datavis3d/axis/qvalueaxis.cpp) | 86 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dvalueaxis.h (renamed from src/datavis3d/axis/qvalueaxis.h) | 16 | ||||
| -rw-r--r-- | src/datavis3d/axis/q3dvalueaxis_p.h (renamed from src/datavis3d/axis/qvalueaxis_p.h) | 14 |
10 files changed, 148 insertions, 149 deletions
diff --git a/src/datavis3d/axis/axis.pri b/src/datavis3d/axis/axis.pri index 7d5a1c6f..4e96618b 100644 --- a/src/datavis3d/axis/axis.pri +++ b/src/datavis3d/axis/axis.pri @@ -1,12 +1,12 @@ HEADERS += \ - $$PWD/qabstractaxis.h \ - $$PWD/qabstractaxis_p.h \ - $$PWD/qvalueaxis.h \ - $$PWD/qvalueaxis_p.h \ - $$PWD/qcategoryaxis.h \ - $$PWD/qcategoryaxis_p.h + $$PWD/q3dabstractaxis.h \ + $$PWD/q3dabstractaxis_p.h \ + $$PWD/q3dvalueaxis.h \ + $$PWD/q3dvalueaxis_p.h \ + $$PWD/q3dcategoryaxis.h \ + $$PWD/q3dcategoryaxis_p.h SOURCES += \ - $$PWD/qabstractaxis.cpp \ - $$PWD/qvalueaxis.cpp \ - $$PWD/qcategoryaxis.cpp + $$PWD/q3dabstractaxis.cpp \ + $$PWD/q3dvalueaxis.cpp \ + $$PWD/q3dcategoryaxis.cpp diff --git a/src/datavis3d/axis/qabstractaxis.cpp b/src/datavis3d/axis/q3dabstractaxis.cpp index 0b233903..215351b8 100644 --- a/src/datavis3d/axis/qabstractaxis.cpp +++ b/src/datavis3d/axis/q3dabstractaxis.cpp @@ -16,24 +16,24 @@ ** ****************************************************************************/ -#include "qabstractaxis.h" -#include "qabstractaxis_p.h" +#include "q3dabstractaxis.h" +#include "q3dabstractaxis_p.h" QT_DATAVIS3D_BEGIN_NAMESPACE /*! - * \class QAbstractAxis + * \class Q3DAbstractAxis * \inmodule QtDataVis3D - * \brief QAbstractAxis is base class for axes of a graph. + * \brief Q3DAbstractAxis is base class for axes of a graph. * \since 1.0.0 * * You should not need to use this class directly, but one of its subclasses instead. * - * \sa QCategoryAxis, QValueAxis + * \sa Q3DCategoryAxis, Q3DValueAxis */ /*! - * \enum QAbstractAxis::AxisOrientation + * \enum Q3DAbstractAxis::AxisOrientation * * The orientation of the axis object. * @@ -44,7 +44,7 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * \enum QAbstractAxis::AxisType + * \enum Q3DAbstractAxis::AxisType * * The type of the axis object. * @@ -56,61 +56,61 @@ QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \internal */ -QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent) : +Q3DAbstractAxis::Q3DAbstractAxis(Q3DAbstractAxisPrivate *d, QObject *parent) : QObject(parent), d_ptr(d) { } /*! - * Destroys QAbstractAxis. + * Destroys Q3DAbstractAxis. */ -QAbstractAxis::~QAbstractAxis() +Q3DAbstractAxis::~Q3DAbstractAxis() { } /*! - * \property QAbstractAxis::title + * \property Q3DAbstractAxis::title * * Defines the title for the axis. */ -QString QAbstractAxis::title() const +QString Q3DAbstractAxis::title() const { return d_ptr->m_title; } /*! - * \property QAbstractAxis::labels + * \property Q3DAbstractAxis::labels * * Defines the labels for the axis. */ -QStringList QAbstractAxis::labels() const +QStringList Q3DAbstractAxis::labels() const { d_ptr->updateLabels(); return d_ptr->m_labels; } /*! - * \property QAbstractAxis::orientation + * \property Q3DAbstractAxis::orientation * - * Defines the orientation of the axis, one of \c QAbstractAxis::AxisOrientation. + * Defines the orientation of the axis, one of \c Q3DAbstractAxis::AxisOrientation. */ -QAbstractAxis::AxisOrientation QAbstractAxis::orientation() const +Q3DAbstractAxis::AxisOrientation Q3DAbstractAxis::orientation() const { return d_ptr->m_orientation; } /*! - * \property QAbstractAxis::type + * \property Q3DAbstractAxis::type * - * Defines the type of the axis, one of \c QAbstractAxis::AxisType. + * Defines the type of the axis, one of \c Q3DAbstractAxis::AxisType. */ -QAbstractAxis::AxisType QAbstractAxis::type() const +Q3DAbstractAxis::AxisType Q3DAbstractAxis::type() const { return d_ptr->m_type; } -void QAbstractAxis::setTitle(QString title) +void Q3DAbstractAxis::setTitle(QString title) { if (d_ptr->m_title != title) { d_ptr->m_title = title; @@ -118,30 +118,30 @@ void QAbstractAxis::setTitle(QString title) } } -// QAbstractAxisPrivate +// Q3DAbstractAxisPrivate -QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q, QAbstractAxis::AxisType type) +Q3DAbstractAxisPrivate::Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAxis::AxisType type) : QObject(0), q_ptr(q), - m_orientation(QAbstractAxis::AxisOrientationNone), + m_orientation(Q3DAbstractAxis::AxisOrientationNone), m_type(type), m_isDefaultAxis(false) { } -QAbstractAxisPrivate::~QAbstractAxisPrivate() +Q3DAbstractAxisPrivate::~Q3DAbstractAxisPrivate() { } -void QAbstractAxisPrivate::setOrientation(QAbstractAxis::AxisOrientation orientation) +void Q3DAbstractAxisPrivate::setOrientation(Q3DAbstractAxis::AxisOrientation orientation) { - if (m_orientation == QAbstractAxis::AxisOrientationNone) + if (m_orientation == Q3DAbstractAxis::AxisOrientationNone) m_orientation = orientation; else Q_ASSERT("Attempted to reset axis orientation."); } -void QAbstractAxisPrivate::updateLabels() +void Q3DAbstractAxisPrivate::updateLabels() { // Default implementation does nothing } diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/q3dabstractaxis.h index 04c25af4..37bdb89e 100644 --- a/src/datavis3d/axis/qabstractaxis.h +++ b/src/datavis3d/axis/q3dabstractaxis.h @@ -16,8 +16,8 @@ ** ****************************************************************************/ -#ifndef QABSTRACTAXIS_H -#define QABSTRACTAXIS_H +#ifndef Q3DABSTRACTAXIS_H +#define Q3DABSTRACTAXIS_H #include <QtDataVis3D/qdatavis3denums.h> #include <QObject> @@ -27,9 +27,9 @@ QT_DATAVIS3D_BEGIN_NAMESPACE -class QAbstractAxisPrivate; +class Q3DAbstractAxisPrivate; -class QT_DATAVIS3D_EXPORT QAbstractAxis : public QObject +class QT_DATAVIS3D_EXPORT Q3DAbstractAxis : public QObject { Q_OBJECT Q_ENUMS(AxisOrientation) @@ -55,10 +55,10 @@ public: }; protected: - explicit QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent = 0); + explicit Q3DAbstractAxis(Q3DAbstractAxisPrivate *d, QObject *parent = 0); public: - virtual ~QAbstractAxis(); + virtual ~Q3DAbstractAxis(); QString title() const; QStringList labels() const; @@ -74,10 +74,10 @@ signals: void labelsChanged(); protected: - QScopedPointer<QAbstractAxisPrivate> d_ptr; + QScopedPointer<Q3DAbstractAxisPrivate> d_ptr; private: - Q_DISABLE_COPY(QAbstractAxis) + Q_DISABLE_COPY(Q3DAbstractAxis) friend class Abstract3DController; friend class Bars3DController; diff --git a/src/datavis3d/axis/qabstractaxis_p.h b/src/datavis3d/axis/q3dabstractaxis_p.h index 6422868f..77f362db 100644 --- a/src/datavis3d/axis/qabstractaxis_p.h +++ b/src/datavis3d/axis/q3dabstractaxis_p.h @@ -27,22 +27,22 @@ // We mean it. #include "datavis3dglobal_p.h" -#include "qabstractaxis.h" +#include "q3dabstractaxis.h" #include "abstract3dcontroller_p.h" -#ifndef QABSTRACTAXIS_P_H -#define QABSTRACTAXIS_P_H +#ifndef Q3DABSTRACTAXIS_P_H +#define Q3DABSTRACTAXIS_P_H QT_DATAVIS3D_BEGIN_NAMESPACE -class QAbstractAxisPrivate : public QObject +class Q3DAbstractAxisPrivate : public QObject { Q_OBJECT public: - QAbstractAxisPrivate(QAbstractAxis *q, QAbstractAxis::AxisType type); - virtual ~QAbstractAxisPrivate(); + Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAxis::AxisType type); + virtual ~Q3DAbstractAxisPrivate(); - void setOrientation(QAbstractAxis::AxisOrientation orientation); + void setOrientation(Q3DAbstractAxis::AxisOrientation orientation); inline bool isDefaultAxis() { return m_isDefaultAxis; } inline void setDefaultAxis(bool isDefault) { m_isDefaultAxis = isDefault; } @@ -50,17 +50,17 @@ public: protected: virtual void updateLabels(); - QAbstractAxis *q_ptr; + Q3DAbstractAxis *q_ptr; QString m_title; QStringList m_labels; - QAbstractAxis::AxisOrientation m_orientation; - QAbstractAxis::AxisType m_type; + Q3DAbstractAxis::AxisOrientation m_orientation; + Q3DAbstractAxis::AxisType m_type; bool m_isDefaultAxis; - friend class QAbstractAxis; - friend class QValueAxis; - friend class QCategoryAxis; + friend class Q3DAbstractAxis; + friend class Q3DValueAxis; + friend class Q3DCategoryAxis; }; QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qcategoryaxis.cpp b/src/datavis3d/axis/q3dcategoryaxis.cpp index 8148ae0c..2090ad1c 100644 --- a/src/datavis3d/axis/qcategoryaxis.cpp +++ b/src/datavis3d/axis/q3dcategoryaxis.cpp @@ -16,18 +16,18 @@ ** ****************************************************************************/ -#include "qcategoryaxis.h" -#include "qcategoryaxis_p.h" +#include "q3dcategoryaxis.h" +#include "q3dcategoryaxis_p.h" QT_DATAVIS3D_BEGIN_NAMESPACE /*! - * \class QCategoryAxis + * \class Q3DCategoryAxis * \inmodule QtDataVis3D - * \brief The QCategoryAxis class is used for manipulating an axis of a graph. + * \brief The Q3DCategoryAxis class is used for manipulating an axis of a graph. * \since 1.0.0 * - * QCategoryAxis provides an axis that can be given labels. The axis is divided into equal-sized + * Q3DCategoryAxis provides an axis that can be given labels. The axis is divided into equal-sized * categories based on \l {Q3DBars::setDataWindow()}{data window} size. * * Grid lines are drawn between categories, if visible. Labels are drawn to positions of categories @@ -35,32 +35,32 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QCategoryAxis with \a parent. + * Constructs Q3DCategoryAxis with \a parent. */ -QCategoryAxis::QCategoryAxis(QObject *parent) : - QAbstractAxis(new QCategoryAxisPrivate(this), parent) +Q3DCategoryAxis::Q3DCategoryAxis(QObject *parent) : + Q3DAbstractAxis(new Q3DCategoryAxisPrivate(this), parent) { } /*! - * Destroys QCategoryAxis. + * Destroys Q3DCategoryAxis. */ -QCategoryAxis::~QCategoryAxis() +Q3DCategoryAxis::~Q3DCategoryAxis() { } /*! - * \property QCategoryAxis::categoryLabels + * \property Q3DCategoryAxis::categoryLabels * * Defines labels for axis applied to categories. If there are fewer labels than categories, the * remaining ones do not have a label. */ -QStringList QCategoryAxis::categoryLabels() const +QStringList Q3DCategoryAxis::categoryLabels() const { return labels(); } -void QCategoryAxis::setCategoryLabels(const QStringList &labels) +void Q3DCategoryAxis::setCategoryLabels(const QStringList &labels) { if (d_ptr->m_labels != labels) { d_ptr->m_labels = labels; @@ -71,17 +71,17 @@ void QCategoryAxis::setCategoryLabels(const QStringList &labels) /*! * \internal */ -QCategoryAxisPrivate *QCategoryAxis::dptr() +Q3DCategoryAxisPrivate *Q3DCategoryAxis::dptr() { - return static_cast<QCategoryAxisPrivate *>(d_ptr.data()); + return static_cast<Q3DCategoryAxisPrivate *>(d_ptr.data()); } -QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis *q) - : QAbstractAxisPrivate(q, QAbstractAxis::AxisTypeCategory) +Q3DCategoryAxisPrivate::Q3DCategoryAxisPrivate(Q3DCategoryAxis *q) + : Q3DAbstractAxisPrivate(q, Q3DAbstractAxis::AxisTypeCategory) { } -QCategoryAxisPrivate::~QCategoryAxisPrivate() +Q3DCategoryAxisPrivate::~Q3DCategoryAxisPrivate() { } diff --git a/src/datavis3d/axis/qcategoryaxis.h b/src/datavis3d/axis/q3dcategoryaxis.h index ab82e8d6..15e9b6ed 100644 --- a/src/datavis3d/axis/qcategoryaxis.h +++ b/src/datavis3d/axis/q3dcategoryaxis.h @@ -16,16 +16,16 @@ ** ****************************************************************************/ -#ifndef QCATEGORYAXIS_H -#define QCATEGORYAXIS_H +#ifndef Q3DCATEGORYAXIS_H +#define Q3DCATEGORYAXIS_H -#include <QtDataVis3D/qabstractaxis.h> +#include <QtDataVis3D/q3dabstractaxis.h> QT_DATAVIS3D_BEGIN_NAMESPACE -class QCategoryAxisPrivate; +class Q3DCategoryAxisPrivate; -class QT_DATAVIS3D_EXPORT QCategoryAxis : public QAbstractAxis +class QT_DATAVIS3D_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis { Q_OBJECT // Note: categoryLabels actually reads/writes the labels property in abstract axis, @@ -34,8 +34,8 @@ class QT_DATAVIS3D_EXPORT QCategoryAxis : public QAbstractAxis Q_PROPERTY(QStringList categoryLabels READ categoryLabels WRITE setCategoryLabels) public: - explicit QCategoryAxis(QObject *parent = 0); - virtual ~QCategoryAxis(); + explicit Q3DCategoryAxis(QObject *parent = 0); + virtual ~Q3DCategoryAxis(); QStringList categoryLabels() const; @@ -43,11 +43,10 @@ public slots: void setCategoryLabels(const QStringList &labels); protected: - QCategoryAxisPrivate *dptr(); + Q3DCategoryAxisPrivate *dptr(); private: - - Q_DISABLE_COPY(QCategoryAxis) + Q_DISABLE_COPY(Q3DCategoryAxis) }; QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qcategoryaxis_p.h b/src/datavis3d/axis/q3dcategoryaxis_p.h index 3ca79c64..e2e9d574 100644 --- a/src/datavis3d/axis/qcategoryaxis_p.h +++ b/src/datavis3d/axis/q3dcategoryaxis_p.h @@ -26,8 +26,8 @@ // // We mean it. -#include "qcategoryaxis.h" -#include "qabstractaxis_p.h" +#include "q3dcategoryaxis.h" +#include "q3dabstractaxis_p.h" #include "qbardataitem.h" #ifndef QCATEGORYAXIS_P_H @@ -35,13 +35,13 @@ QT_DATAVIS3D_BEGIN_NAMESPACE -class QCategoryAxisPrivate : public QAbstractAxisPrivate +class Q3DCategoryAxisPrivate : public Q3DAbstractAxisPrivate { Q_OBJECT public: - QCategoryAxisPrivate(QCategoryAxis *q); - virtual ~QCategoryAxisPrivate(); + Q3DCategoryAxisPrivate(Q3DCategoryAxis *q); + virtual ~Q3DCategoryAxisPrivate(); }; QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qvalueaxis.cpp b/src/datavis3d/axis/q3dvalueaxis.cpp index 9520cacd..50a0525c 100644 --- a/src/datavis3d/axis/qvalueaxis.cpp +++ b/src/datavis3d/axis/q3dvalueaxis.cpp @@ -16,19 +16,19 @@ ** ****************************************************************************/ -#include "qvalueaxis.h" -#include "qvalueaxis_p.h" +#include "q3dvalueaxis.h" +#include "q3dvalueaxis_p.h" #include "utils_p.h" QT_DATAVIS3D_BEGIN_NAMESPACE /*! - * \class QValueAxis + * \class Q3DValueAxis * \inmodule QtDataVis3D - * \brief The QValueAxis class is used for manipulating an axis of a graph. + * \brief The Q3DValueAxis class is used for manipulating an axis of a graph. * \since 1.0.0 * - * QValueAxis provides an axis that can be given a range of values and segment and subsegment + * Q3DValueAxis 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 @@ -37,17 +37,17 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QValueAxis with the given \a parent. + * Constructs Q3DValueAxis with the given \a parent. */ -QValueAxis::QValueAxis(QObject *parent) : - QAbstractAxis(new QValueAxisPrivate(this), parent) +Q3DValueAxis::Q3DValueAxis(QObject *parent) : + Q3DAbstractAxis(new Q3DValueAxisPrivate(this), parent) { } /*! - * Destroys QValueAxis. + * Destroys Q3DValueAxis. */ -QValueAxis::~QValueAxis() +Q3DValueAxis::~Q3DValueAxis() { } @@ -55,50 +55,50 @@ QValueAxis::~QValueAxis() * 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. */ -void QValueAxis::setRange(qreal min, qreal max) +void Q3DValueAxis::setRange(qreal min, qreal max) { dptr()->setRange(min, max); setAutoAdjustRange(false); } /*! - * \property QValueAxis::min + * \property Q3DValueAxis::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. */ -void QValueAxis::setMin(qreal min) +void Q3DValueAxis::setMin(qreal min) { dptr()->setMin(min); setAutoAdjustRange(false); } /*! - * \property QValueAxis::max + * \property Q3DValueAxis::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. */ -void QValueAxis::setMax(qreal max) +void Q3DValueAxis::setMax(qreal max) { dptr()->setMax(max); setAutoAdjustRange(false); } -qreal QValueAxis::min() const +qreal Q3DValueAxis::min() const { return dptrc()->m_min; } -qreal QValueAxis::max() const +qreal Q3DValueAxis::max() const { return dptrc()->m_max; } /*! - * \property QValueAxis::segmentCount + * \property Q3DValueAxis::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}. @@ -106,7 +106,7 @@ qreal QValueAxis::max() const * * \sa setSubSegmentCount() */ -void QValueAxis::setSegmentCount(int count) +void Q3DValueAxis::setSegmentCount(int count) { if (count <= 0) { qWarning() << "Warning: Illegal segment count automatically adjusted to a legal one:" @@ -120,13 +120,13 @@ void QValueAxis::setSegmentCount(int count) } } -int QValueAxis::segmentCount() const +int Q3DValueAxis::segmentCount() const { return dptrc()->m_segmentCount; } /*! - * \property QValueAxis::subSegmentCount + * \property Q3DValueAxis::subSegmentCount * * Defines the number of subsegments inside each segment on the axis. Grid lines are drawn between * each subsegment, in addition to each segment. @@ -134,7 +134,7 @@ int QValueAxis::segmentCount() const * * \sa setSegmentCount() **/ -void QValueAxis::setSubSegmentCount(int count) +void Q3DValueAxis::setSubSegmentCount(int count) { if (count <= 0) { qWarning() << "Warning: Illegal subsegment count automatically adjusted to a legal one:" @@ -147,20 +147,20 @@ void QValueAxis::setSubSegmentCount(int count) } } -int QValueAxis::subSegmentCount() const +int Q3DValueAxis::subSegmentCount() const { return dptrc()->m_subSegmentCount; } /*! - * \property QValueAxis::autoAdjustRange + * \property Q3DValueAxis::autoAdjustRange * * Tells the axis to automatically calculate the range instead of setting range or adjusting min or * max property. * * \sa setRange(), setMin(), setMax() */ -void QValueAxis::setAutoAdjustRange(bool autoAdjust) +void Q3DValueAxis::setAutoAdjustRange(bool autoAdjust) { if (dptr()->m_autoAdjust != autoAdjust) { dptr()->m_autoAdjust = autoAdjust; @@ -168,13 +168,13 @@ void QValueAxis::setAutoAdjustRange(bool autoAdjust) } } -bool QValueAxis::isAutoAdjustRange() const +bool Q3DValueAxis::isAutoAdjustRange() const { return dptrc()->m_autoAdjust; } /*! - * \property QValueAxis::labelFormat + * \property Q3DValueAxis::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. @@ -183,7 +183,7 @@ bool QValueAxis::isAutoAdjustRange() const * * \c {axis->setLabelFormat("%.2f mm");} */ -void QValueAxis::setLabelFormat(const QString &format) +void Q3DValueAxis::setLabelFormat(const QString &format) { if (dptr()->m_labelFormat != format) { dptr()->m_labelFormat = format; @@ -192,7 +192,7 @@ void QValueAxis::setLabelFormat(const QString &format) } } -QString QValueAxis::labelFormat() const +QString Q3DValueAxis::labelFormat() const { return dptrc()->m_labelFormat; } @@ -200,21 +200,21 @@ QString QValueAxis::labelFormat() const /*! * \internal */ -QValueAxisPrivate *QValueAxis::dptr() +Q3DValueAxisPrivate *Q3DValueAxis::dptr() { - return static_cast<QValueAxisPrivate *>(d_ptr.data()); + return static_cast<Q3DValueAxisPrivate *>(d_ptr.data()); } /*! * \internal */ -const QValueAxisPrivate *QValueAxis::dptrc() const +const Q3DValueAxisPrivate *Q3DValueAxis::dptrc() const { - return static_cast<const QValueAxisPrivate *>(d_ptr.data()); + return static_cast<const Q3DValueAxisPrivate *>(d_ptr.data()); } -QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q) - : QAbstractAxisPrivate(q, QAbstractAxis::AxisTypeValue), +Q3DValueAxisPrivate::Q3DValueAxisPrivate(Q3DValueAxis *q) + : Q3DAbstractAxisPrivate(q, Q3DAbstractAxis::AxisTypeValue), m_min(0.0), m_max(10.0), m_segmentCount(5), @@ -225,11 +225,11 @@ QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q) { } -QValueAxisPrivate::~QValueAxisPrivate() +Q3DValueAxisPrivate::~Q3DValueAxisPrivate() { } -void QValueAxisPrivate::setRange(qreal min, qreal max) +void Q3DValueAxisPrivate::setRange(qreal min, qreal max) { // If min >= max, we adjust ranges so that // m_max becomes (min + 1.0) @@ -257,7 +257,7 @@ void QValueAxisPrivate::setRange(qreal min, qreal max) } } -void QValueAxisPrivate::setMin(qreal min) +void Q3DValueAxisPrivate::setMin(qreal min) { if (m_min != min) { if (min >= m_max) { @@ -273,7 +273,7 @@ void QValueAxisPrivate::setMin(qreal min) } } -void QValueAxisPrivate::setMax(qreal max) +void Q3DValueAxisPrivate::setMax(qreal max) { if (m_max != max) { if (max <= m_min) { @@ -289,13 +289,13 @@ void QValueAxisPrivate::setMax(qreal max) } } -void QValueAxisPrivate::emitLabelsChanged() +void Q3DValueAxisPrivate::emitLabelsChanged() { m_labelsDirty = true; emit q_ptr->labelsChanged(); } -void QValueAxisPrivate::updateLabels() +void Q3DValueAxisPrivate::updateLabels() { if (!m_labelsDirty) return; @@ -324,9 +324,9 @@ void QValueAxisPrivate::updateLabels() m_labels = newLabels; } -QValueAxis *QValueAxisPrivate::qptr() +Q3DValueAxis *Q3DValueAxisPrivate::qptr() { - return static_cast<QValueAxis *>(q_ptr); + return static_cast<Q3DValueAxis *>(q_ptr); } QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/axis/qvalueaxis.h b/src/datavis3d/axis/q3dvalueaxis.h index 1d527feb..07e21a41 100644 --- a/src/datavis3d/axis/qvalueaxis.h +++ b/src/datavis3d/axis/q3dvalueaxis.h @@ -19,13 +19,13 @@ #ifndef QVALUEAXIS_H #define QVALUEAXIS_H -#include <QtDataVis3D/qabstractaxis.h> +#include <QtDataVis3D/q3dabstractaxis.h> QT_DATAVIS3D_BEGIN_NAMESPACE -class QValueAxisPrivate; +class Q3DValueAxisPrivate; -class QT_DATAVIS3D_EXPORT QValueAxis : public QAbstractAxis +class QT_DATAVIS3D_EXPORT Q3DValueAxis : public Q3DAbstractAxis { Q_OBJECT Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY rangeChanged) @@ -36,8 +36,8 @@ class QT_DATAVIS3D_EXPORT QValueAxis : public QAbstractAxis Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) public: - explicit QValueAxis(QObject *parent = 0); - virtual ~QValueAxis(); + explicit Q3DValueAxis(QObject *parent = 0); + virtual ~Q3DValueAxis(); qreal min() const; qreal max() const; @@ -63,11 +63,11 @@ signals: void labelFormatChanged(QString format); protected: - QValueAxisPrivate *dptr(); - const QValueAxisPrivate *dptrc() const; + Q3DValueAxisPrivate *dptr(); + const Q3DValueAxisPrivate *dptrc() const; private: - Q_DISABLE_COPY(QValueAxis) + Q_DISABLE_COPY(Q3DValueAxis) friend class Bars3DController; friend class Scatter3DController; }; diff --git a/src/datavis3d/axis/qvalueaxis_p.h b/src/datavis3d/axis/q3dvalueaxis_p.h index 6d8cc362..823983aa 100644 --- a/src/datavis3d/axis/qvalueaxis_p.h +++ b/src/datavis3d/axis/q3dvalueaxis_p.h @@ -26,21 +26,21 @@ // // We mean it. -#include "qvalueaxis.h" -#include "qabstractaxis_p.h" +#include "q3dvalueaxis.h" +#include "q3dabstractaxis_p.h" #ifndef QVALUEAXIS_P_H #define QVALUEAXIS_P_H QT_DATAVIS3D_BEGIN_NAMESPACE -class QValueAxisPrivate : public QAbstractAxisPrivate +class Q3DValueAxisPrivate : public Q3DAbstractAxisPrivate { Q_OBJECT public: - QValueAxisPrivate(QValueAxis *q); - virtual ~QValueAxisPrivate(); + Q3DValueAxisPrivate(Q3DValueAxis *q); + virtual ~Q3DValueAxisPrivate(); void setRange(qreal min, qreal max); void setMin(qreal min); @@ -59,9 +59,9 @@ protected: bool m_labelsDirty; private: - QValueAxis *qptr(); + Q3DValueAxis *qptr(); - friend class QValueAxis; + friend class Q3DValueAxis; }; QT_DATAVIS3D_END_NAMESPACE |