From 467e729eabece018cd42eeee0160f932983561b0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 7 Jan 2014 13:11:34 +0200 Subject: 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 --- examples/audiolevels/audiolevels.cpp | 2 +- examples/bars/graphmodifier.cpp | 10 +- examples/bars/graphmodifier.h | 6 +- examples/custominput/scatterdatamodifier.cpp | 8 +- examples/customproxy/rainfallgraph.cpp | 4 +- examples/itemmodel/main.cpp | 4 +- examples/scatter/scatterdatamodifier.cpp | 8 +- examples/surface/surfacegraph.cpp | 8 +- src/datavisualization/axis/axis.pri | 18 +- src/datavisualization/axis/q3dabstractaxis.cpp | 404 --------------------- src/datavisualization/axis/q3dabstractaxis.h | 107 ------ src/datavisualization/axis/q3dabstractaxis_p.h | 77 ---- src/datavisualization/axis/q3dcategoryaxis.cpp | 156 -------- src/datavisualization/axis/q3dcategoryaxis.h | 53 --- src/datavisualization/axis/q3dcategoryaxis_p.h | 57 --- src/datavisualization/axis/q3dvalueaxis.cpp | 270 -------------- src/datavisualization/axis/q3dvalueaxis.h | 65 ---- src/datavisualization/axis/q3dvalueaxis_p.h | 66 ---- src/datavisualization/axis/qabstract3daxis.cpp | 404 +++++++++++++++++++++ src/datavisualization/axis/qabstract3daxis.h | 107 ++++++ src/datavisualization/axis/qabstract3daxis_p.h | 77 ++++ src/datavisualization/axis/qcategory3daxis.cpp | 156 ++++++++ src/datavisualization/axis/qcategory3daxis.h | 53 +++ src/datavisualization/axis/qcategory3daxis_p.h | 57 +++ src/datavisualization/axis/qvalue3daxis.cpp | 270 ++++++++++++++ src/datavisualization/axis/qvalue3daxis.h | 65 ++++ src/datavisualization/axis/qvalue3daxis_p.h | 66 ++++ src/datavisualization/data/qbar3dseries.cpp | 2 +- src/datavisualization/data/qbardataproxy.cpp | 2 +- src/datavisualization/data/qscatter3dseries.cpp | 6 +- src/datavisualization/data/qsurface3dseries.cpp | 6 +- .../engine/abstract3dcontroller.cpp | 160 ++++---- .../engine/abstract3dcontroller_p.h | 40 +- .../engine/abstract3drenderer.cpp | 30 +- .../engine/abstract3drenderer_p.h | 16 +- src/datavisualization/engine/axisrendercache.cpp | 4 +- src/datavisualization/engine/axisrendercache_p.h | 8 +- src/datavisualization/engine/bars3dcontroller.cpp | 28 +- src/datavisualization/engine/bars3dcontroller_p.h | 8 +- src/datavisualization/engine/bars3drenderer.cpp | 4 +- src/datavisualization/engine/bars3drenderer_p.h | 2 +- src/datavisualization/engine/q3dbars.cpp | 28 +- src/datavisualization/engine/q3dbars.h | 24 +- src/datavisualization/engine/q3dscatter.cpp | 34 +- src/datavisualization/engine/q3dscatter.h | 22 +- src/datavisualization/engine/q3dsurface.cpp | 36 +- src/datavisualization/engine/q3dsurface.h | 20 +- .../engine/scatter3dcontroller.cpp | 12 +- .../engine/scatter3dcontroller_p.h | 2 +- src/datavisualization/engine/scatter3drenderer.cpp | 2 +- src/datavisualization/engine/scatter3drenderer_p.h | 2 +- .../engine/surface3dcontroller.cpp | 14 +- .../engine/surface3dcontroller_p.h | 2 +- src/datavisualizationqml2/abstractdeclarative.cpp | 2 +- .../datavisualizationqml2_plugin.cpp | 6 +- .../datavisualizationqml2_plugin.h | 10 +- src/datavisualizationqml2/declarativebars.cpp | 20 +- src/datavisualizationqml2/declarativebars_p.h | 28 +- src/datavisualizationqml2/declarativescatter.cpp | 18 +- src/datavisualizationqml2/declarativescatter_p.h | 26 +- src/datavisualizationqml2/declarativesurface.cpp | 20 +- src/datavisualizationqml2/declarativesurface_p.h | 26 +- tests/barstest/chart.cpp | 18 +- tests/barstest/chart.h | 16 +- tests/kinectsurface/surfacedata.cpp | 2 +- tests/multigraphs/data.cpp | 2 +- tests/scattertest/scatterchart.cpp | 14 +- tests/spectrum/spectrumapp/main.cpp | 4 +- tests/surfacetest/graphmodifier.cpp | 8 +- 69 files changed, 1656 insertions(+), 1656 deletions(-) delete mode 100644 src/datavisualization/axis/q3dabstractaxis.cpp delete mode 100644 src/datavisualization/axis/q3dabstractaxis.h delete mode 100644 src/datavisualization/axis/q3dabstractaxis_p.h delete mode 100644 src/datavisualization/axis/q3dcategoryaxis.cpp delete mode 100644 src/datavisualization/axis/q3dcategoryaxis.h delete mode 100644 src/datavisualization/axis/q3dcategoryaxis_p.h delete mode 100644 src/datavisualization/axis/q3dvalueaxis.cpp delete mode 100644 src/datavisualization/axis/q3dvalueaxis.h delete mode 100644 src/datavisualization/axis/q3dvalueaxis_p.h create mode 100644 src/datavisualization/axis/qabstract3daxis.cpp create mode 100644 src/datavisualization/axis/qabstract3daxis.h create mode 100644 src/datavisualization/axis/qabstract3daxis_p.h create mode 100644 src/datavisualization/axis/qcategory3daxis.cpp create mode 100644 src/datavisualization/axis/qcategory3daxis.h create mode 100644 src/datavisualization/axis/qcategory3daxis_p.h create mode 100644 src/datavisualization/axis/qvalue3daxis.cpp create mode 100644 src/datavisualization/axis/qvalue3daxis.h create mode 100644 src/datavisualization/axis/qvalue3daxis_p.h diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp index 33a0be3b..ec63e555 100644 --- a/examples/audiolevels/audiolevels.cpp +++ b/examples/audiolevels/audiolevels.cpp @@ -20,7 +20,7 @@ #include "audiolevels.h" #include -#include +#include #include #include #include diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp index fddc385e..dc1aa1cc 100644 --- a/examples/bars/graphmodifier.cpp +++ b/examples/bars/graphmodifier.cpp @@ -17,8 +17,8 @@ ****************************************************************************/ #include "graphmodifier.h" -#include -#include +#include +#include #include #include #include @@ -42,9 +42,9 @@ GraphModifier::GraphModifier(Q3DBars *bargraph) m_minval(-20.0f), m_maxval(20.0f), //! [1] - m_temperatureAxis(new Q3DValueAxis), - m_yearAxis(new Q3DCategoryAxis), - m_monthAxis(new Q3DCategoryAxis), + m_temperatureAxis(new QValue3DAxis), + m_yearAxis(new QCategory3DAxis), + m_monthAxis(new QCategory3DAxis), m_primaryData(new QBarDataProxy), m_secondaryData(new QBarDataProxy), //! [1] diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h index f7c0acaf..ca56d754 100644 --- a/examples/bars/graphmodifier.h +++ b/examples/bars/graphmodifier.h @@ -74,9 +74,9 @@ private: float m_maxval; QStringList m_months; QStringList m_years; - Q3DValueAxis *m_temperatureAxis; - Q3DCategoryAxis *m_yearAxis; - Q3DCategoryAxis *m_monthAxis; + QValue3DAxis *m_temperatureAxis; + QCategory3DAxis *m_yearAxis; + QCategory3DAxis *m_monthAxis; QBarDataProxy *m_primaryData; QBarDataProxy *m_secondaryData; QAbstract3DSeries::Mesh m_primaryStyle; diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp index acdf3e8d..3e372dec 100644 --- a/examples/custominput/scatterdatamodifier.cpp +++ b/examples/custominput/scatterdatamodifier.cpp @@ -19,7 +19,7 @@ #include "scatterdatamodifier.h" #include -#include +#include #include #include #include @@ -36,9 +36,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_graph->setShadowQuality(QDataVis::ShadowQualityMedium); m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront); - m_graph->setAxisX(new Q3DValueAxis); - m_graph->setAxisY(new Q3DValueAxis); - m_graph->setAxisZ(new Q3DValueAxis); + m_graph->setAxisX(new QValue3DAxis); + m_graph->setAxisY(new QValue3DAxis); + m_graph->setAxisZ(new QValue3DAxis); m_graph->axisX()->setRange(-10.0f, 10.0f); m_graph->axisY()->setRange(-5.0f, 5.0f); diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp index 0fd91419..2e36a865 100644 --- a/examples/customproxy/rainfallgraph.cpp +++ b/examples/customproxy/rainfallgraph.cpp @@ -17,8 +17,8 @@ ****************************************************************************/ #include "rainfallgraph.h" -#include -#include +#include +#include #include #include #include diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp index 8cec91ba..f7a4b737 100644 --- a/examples/itemmodel/main.cpp +++ b/examples/itemmodel/main.cpp @@ -17,9 +17,9 @@ ****************************************************************************/ #include -#include +#include #include -#include +#include #include #include #include diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp index ade34da4..bbc1e588 100644 --- a/examples/scatter/scatterdatamodifier.cpp +++ b/examples/scatter/scatterdatamodifier.cpp @@ -18,7 +18,7 @@ #include "scatterdatamodifier.h" #include -#include +#include #include #include #include @@ -48,9 +48,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) //! [0] //! [1] - m_graph->setAxisX(new Q3DValueAxis); - m_graph->setAxisY(new Q3DValueAxis); - m_graph->setAxisZ(new Q3DValueAxis); + m_graph->setAxisX(new QValue3DAxis); + m_graph->setAxisY(new QValue3DAxis); + m_graph->setAxisZ(new QValue3DAxis); //! [1] //! [2] diff --git a/examples/surface/surfacegraph.cpp b/examples/surface/surfacegraph.cpp index a3d2b60e..495cd63b 100644 --- a/examples/surface/surfacegraph.cpp +++ b/examples/surface/surfacegraph.cpp @@ -18,7 +18,7 @@ #include "surfacegraph.h" -#include +#include #include #include #include @@ -35,9 +35,9 @@ const float sampleMax = 8.0f; SurfaceGraph::SurfaceGraph(Q3DSurface *surface) : m_graph(surface) { - m_graph->setAxisX(new Q3DValueAxis); - m_graph->setAxisY(new Q3DValueAxis); - m_graph->setAxisZ(new Q3DValueAxis); + m_graph->setAxisX(new QValue3DAxis); + m_graph->setAxisY(new QValue3DAxis); + m_graph->setAxisZ(new QValue3DAxis); //! [0] m_sqrtSinProxy = new QSurfaceDataProxy(); 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/q3dabstractaxis.cpp deleted file mode 100644 index 0b284947..00000000 --- a/src/datavisualization/axis/q3dabstractaxis.cpp +++ /dev/null @@ -1,404 +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 -** -****************************************************************************/ - -#include "q3dabstractaxis.h" -#include "q3dabstractaxis_p.h" - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -/*! - * \class Q3DAbstractAxis - * \inmodule QtDataVisualization - * \brief Q3DAbstractAxis 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 - */ - -/*! - * \qmltype AbstractAxis3D - * \inqmlmodule QtDataVisualization - * \since QtDataVisualization 1.0 - * \ingroup datavisualization_qml - * \instantiates Q3DAbstractAxis - * \brief AbstractAxis3D is base type for axes of a graph. - * - * This type is uncreatable, but contains properties that are exposed via subtypes. - */ - -/*! - * \qmlproperty string AbstractAxis3D::title - * Defines the title for the axis. - */ - -/*! - * \qmlproperty list AbstractAxis3D::labels - * Defines the labels for the axis. - * \note Setting this property for ValueAxis3D does nothing, as it generates labels automatically. - */ - -/*! - * \qmlproperty AbstractAxis3D.AxisOrientation AbstractAxis3D::orientation - * Defines the orientation of the axis. - */ - -/*! - * \qmlproperty AbstractAxis3D.AxisType AbstractAxis3D::type - * Defines the type of the axis. - */ - -/*! - * \qmlproperty real AbstractAxis3D::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. - */ - -/*! - * \qmlproperty real AbstractAxis3D::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. - */ - -/*! - * \qmlproperty bool AbstractAxis3D::autoAdjustRange - * - * If set, the axis will automatically adjust the range so that all data fits in it. - */ - - -/*! - * \enum Q3DAbstractAxis::AxisOrientation - * - * The orientation of the axis object. - * - * \value AxisOrientationNone - * \value AxisOrientationX - * \value AxisOrientationY - * \value AxisOrientationZ - */ - -/*! - * \enum Q3DAbstractAxis::AxisType - * - * The type of the axis object. - * - * \value AxisTypeNone - * \value AxisTypeCategory - * \value AxisTypeValue - */ - -/*! - * \internal - */ -Q3DAbstractAxis::Q3DAbstractAxis(Q3DAbstractAxisPrivate *d, QObject *parent) : - QObject(parent), - d_ptr(d) -{ -} - -/*! - * Destroys Q3DAbstractAxis. - */ -Q3DAbstractAxis::~Q3DAbstractAxis() -{ -} - -/*! - * \property Q3DAbstractAxis::orientation - * - * Defines the orientation of the axis, one of \c Q3DAbstractAxis::AxisOrientation. - */ -Q3DAbstractAxis::AxisOrientation Q3DAbstractAxis::orientation() const -{ - return d_ptr->m_orientation; -} - -/*! - * \property Q3DAbstractAxis::type - * - * Defines the type of the axis, one of \c Q3DAbstractAxis::AxisType. - */ -Q3DAbstractAxis::AxisType Q3DAbstractAxis::type() const -{ - return d_ptr->m_type; -} - -/*! - * \property Q3DAbstractAxis::title - * - * Defines the title for the axis. - */ -void Q3DAbstractAxis::setTitle(QString title) -{ - if (d_ptr->m_title != title) { - d_ptr->m_title = title; - emit titleChanged(title); - } -} - -QString Q3DAbstractAxis::title() const -{ - return d_ptr->m_title; -} - -/*! - * \property Q3DAbstractAxis::labels - * - * Defines the labels for the axis. - * \note Setting this property for Q3DValueAxis does nothing, as it generates labels automatically. - */ -void Q3DAbstractAxis::setLabels(const QStringList &labels) -{ - Q_UNUSED(labels) -} - -QStringList Q3DAbstractAxis::labels() const -{ - d_ptr->updateLabels(); - return d_ptr->m_labels; -} - -/*! - * 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. - */ -void Q3DAbstractAxis::setRange(float min, float max) -{ - d_ptr->setRange(min, max); - setAutoAdjustRange(false); -} - -/*! - * \property Q3DAbstractAxis::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. - */ -void Q3DAbstractAxis::setMin(float min) -{ - d_ptr->setMin(min); - setAutoAdjustRange(false); -} - -/*! - * \property Q3DAbstractAxis::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. - */ -void Q3DAbstractAxis::setMax(float max) -{ - d_ptr->setMax(max); - setAutoAdjustRange(false); -} - -float Q3DAbstractAxis::min() const -{ - return d_ptr->m_min; -} - -float Q3DAbstractAxis::max() const -{ - return d_ptr->m_max; -} - -/*! - * \property Q3DAbstractAxis::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) -{ - if (d_ptr->m_autoAdjust != autoAdjust) { - d_ptr->m_autoAdjust = autoAdjust; - emit autoAdjustRangeChanged(autoAdjust); - } -} - -bool Q3DAbstractAxis::isAutoAdjustRange() const -{ - return d_ptr->m_autoAdjust; -} - -/*! - * \fn Q3DAbstractAxis::rangeChanged(float min, float max) - * - * Emits range \a min and \a max values when range changes. - */ - -// Q3DAbstractAxisPrivate - -Q3DAbstractAxisPrivate::Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAxis::AxisType type) - : QObject(0), - q_ptr(q), - m_orientation(Q3DAbstractAxis::AxisOrientationNone), - m_type(type), - m_isDefaultAxis(false), - m_min(0.0f), - m_max(10.0f), - m_autoAdjust(true), - m_onlyPositiveValues(false), - m_allowMinMaxSame(false) -{ -} - -Q3DAbstractAxisPrivate::~Q3DAbstractAxisPrivate() -{ -} - -void Q3DAbstractAxisPrivate::setOrientation(Q3DAbstractAxis::AxisOrientation orientation) -{ - if (m_orientation == Q3DAbstractAxis::AxisOrientationNone) { - m_orientation = orientation; - emit q_ptr->orientationChanged(orientation); - } else { - Q_ASSERT("Attempted to reset axis orientation."); - } -} - -void Q3DAbstractAxisPrivate::updateLabels() -{ - // Default implementation does nothing -} - -void Q3DAbstractAxisPrivate::setRange(float min, float max) -{ - bool adjusted = false; - if (m_onlyPositiveValues) { - if (min < 0.0f) { - min = 0.0f; - adjusted = true; - } - if (max < 0.0f) { - max = 0.0f; - adjusted = true; - } - } - // If min >= max, we adjust ranges so that - // m_max becomes (min + 1.0f) - // as axes need some kind of valid range. - bool minDirty = false; - bool maxDirty = false; - if (m_min != min) { - m_min = min; - minDirty = true; - } - if (m_max != max || min > max || (!m_allowMinMaxSame && min == max)) { - if (min > max || (!m_allowMinMaxSame && min == max)) { - m_max = min + 1.0f; - adjusted = true; - } else { - m_max = max; - } - maxDirty = true; - } - - if (minDirty || maxDirty) { - if (adjusted) { - qWarning() << "Warning: Tried to set invalid range for axis." - " Range automatically adjusted to a valid one:" - << min << "-" << max << "-->" << m_min << "-" << m_max; - } - emit q_ptr->rangeChanged(m_min, m_max); - } - - if (minDirty) - emit q_ptr->minChanged(m_min); - if (maxDirty) - emit q_ptr->maxChanged(m_max); -} - -void Q3DAbstractAxisPrivate::setMin(float min) -{ - if (m_onlyPositiveValues) { - if (min < 0.0f) { - min = 0.0f; - qWarning() << "Warning: Tried to set negative minimum for an axis that only supports" - " positive values:" << min; - } - } - - if (m_min != min) { - bool maxChanged = false; - if (min > m_max || (!m_allowMinMaxSame && min == m_max)) { - float oldMax = m_max; - m_max = min + 1.0f; - qWarning() << "Warning: Tried to set minimum to equal or larger than maximum for" - " value axis. Maximum automatically adjusted to a valid one:" - << oldMax << "-->" << m_max; - maxChanged = true; - } - m_min = min; - - emit q_ptr->rangeChanged(m_min, m_max); - emit q_ptr->minChanged(m_min); - if (maxChanged) - emit q_ptr->maxChanged(m_max); - } -} - -void Q3DAbstractAxisPrivate::setMax(float max) -{ - if (m_onlyPositiveValues) { - if (max < 0.0f) { - max = 0.0f; - qWarning() << "Warning: Tried to set negative maximum for an axis that only supports" - " positive values:" << max; - } - } - - if (m_max != max) { - bool minChanged = false; - if (m_min > max || (!m_allowMinMaxSame && m_min == max)) { - float oldMin = m_min; - m_min = max - 1.0f; - if (m_onlyPositiveValues && m_min < 0.0f) { - m_min = 0.0f; - if (!m_allowMinMaxSame && max == 0.0f) { - m_min = oldMin; - qWarning() << "Unable to set maximum value to zero."; - return; - } - } - qWarning() << "Warning: Tried to set maximum to equal or smaller than minimum for" - " value axis. Minimum automatically adjusted to a valid one:" - << oldMin << "-->" << m_min; - minChanged = true; - } - m_max = max; - emit q_ptr->rangeChanged(m_min, m_max); - emit q_ptr->maxChanged(m_max); - if (minChanged) - emit q_ptr->minChanged(m_min); - } -} - -QT_DATAVISUALIZATION_END_NAMESPACE 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 -#include -#include -#include -#include - -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 d_ptr; - -private: - Q_DISABLE_COPY(Q3DAbstractAxis) - - friend class Abstract3DController; - friend class Bars3DController; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QABSTRACTAXIS_H diff --git a/src/datavisualization/axis/q3dabstractaxis_p.h b/src/datavisualization/axis/q3dabstractaxis_p.h deleted file mode 100644 index 3293e41e..00000000 --- a/src/datavisualization/axis/q3dabstractaxis_p.h +++ /dev/null @@ -1,77 +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 -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the QtDataVisualization API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#include "datavisualizationglobal_p.h" -#include "q3dabstractaxis.h" -#include "abstract3dcontroller_p.h" - -#ifndef Q3DABSTRACTAXIS_P_H -#define Q3DABSTRACTAXIS_P_H - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class Q3DAbstractAxisPrivate : public QObject -{ - Q_OBJECT -public: - Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAxis::AxisType type); - virtual ~Q3DAbstractAxisPrivate(); - - void setOrientation(Q3DAbstractAxis::AxisOrientation orientation); - - inline bool isDefaultAxis() { return m_isDefaultAxis; } - inline void setDefaultAxis(bool isDefault) { m_isDefaultAxis = isDefault; } - - virtual void setRange(float min, float max); - virtual void setMin(float min); - virtual void setMax (float max); - -protected: - virtual void updateLabels(); - - Q3DAbstractAxis *q_ptr; - - QString m_title; - QStringList m_labels; - Q3DAbstractAxis::AxisOrientation m_orientation; - Q3DAbstractAxis::AxisType m_type; - bool m_isDefaultAxis; - float m_min; - float m_max; - bool m_autoAdjust; - bool m_onlyPositiveValues; - bool m_allowMinMaxSame; - - friend class Q3DAbstractAxis; - friend class Q3DValueAxis; - friend class Q3DCategoryAxis; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QABSTRACTAXIS_P_H diff --git a/src/datavisualization/axis/q3dcategoryaxis.cpp b/src/datavisualization/axis/q3dcategoryaxis.cpp deleted file mode 100644 index 26a75f93..00000000 --- a/src/datavisualization/axis/q3dcategoryaxis.cpp +++ /dev/null @@ -1,156 +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 -** -****************************************************************************/ - -#include "q3dcategoryaxis.h" -#include "q3dcategoryaxis_p.h" -#include "bars3dcontroller_p.h" -#include "qbardataproxy.h" - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -/*! - * \class Q3DCategoryAxis - * \inmodule QtDataVisualization - * \brief The Q3DCategoryAxis 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 - * 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 - * if provided. - */ - -/*! - * \qmltype CategoryAxis3D - * \inqmlmodule QtDataVisualization - * \since QtDataVisualization 1.0 - * \ingroup datavisualization_qml - * \instantiates Q3DCategoryAxis - * \inherits AbstractAxis3D - * \brief The CategoryAxis3D type is used for manipulating an axis of a graph. - * - * This type provides an axis that can be given labels. - */ - -/*! - * \qmlproperty list CategoryAxis3D::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. - */ - -/*! - * Constructs Q3DCategoryAxis with \a parent. - */ -Q3DCategoryAxis::Q3DCategoryAxis(QObject *parent) : - Q3DAbstractAxis(new Q3DCategoryAxisPrivate(this), parent) -{ - connect(this, &Q3DCategoryAxis::labelsChanged, this, &Q3DAbstractAxis::labelsChanged); -} - -/*! - * Destroys Q3DCategoryAxis. - */ -Q3DCategoryAxis::~Q3DCategoryAxis() -{ -} - -/*! - * \property Q3DCategoryAxis::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. - */ -QStringList Q3DCategoryAxis::labels() const -{ - return Q3DAbstractAxis::labels(); -} - -void Q3DCategoryAxis::setLabels(const QStringList &labels) -{ - dptr()->m_labelsExplicitlySet = !labels.isEmpty(); - bool labelsFromData = false; - - // Get labels from data proxy if axis is attached to a bar controller and an active axis there - if (labels.isEmpty()) { - Bars3DController *controller = qobject_cast(parent()); - if (controller) { - if (controller->axisX() == this) { - controller->handleDataRowLabelsChanged(); - labelsFromData = true; - } else if (controller->axisZ() == this) { - controller->handleDataColumnLabelsChanged(); - labelsFromData = true; - } - } - } - - if (!labelsFromData && d_ptr->m_labels != labels) { - d_ptr->m_labels = labels; - emit labelsChanged(); - } -} - -/*! - * \internal - */ -Q3DCategoryAxisPrivate *Q3DCategoryAxis::dptr() -{ - return static_cast(d_ptr.data()); -} - -Q3DCategoryAxisPrivate::Q3DCategoryAxisPrivate(Q3DCategoryAxis *q) - : Q3DAbstractAxisPrivate(q, Q3DAbstractAxis::AxisTypeCategory), - m_labelsExplicitlySet(false) -{ - m_onlyPositiveValues = true; - m_allowMinMaxSame = true; -} - -Q3DCategoryAxisPrivate::~Q3DCategoryAxisPrivate() -{ -} - -/*! - * \internal - * 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) -{ - if (!m_labelsExplicitlySet && m_labels != labels) { - m_labels = labels; - emit qptr()->labelsChanged(); - } -} - -Q3DCategoryAxis *Q3DCategoryAxisPrivate::qptr() -{ - return static_cast(q_ptr); -} - -QT_DATAVISUALIZATION_END_NAMESPACE diff --git a/src/datavisualization/axis/q3dcategoryaxis.h b/src/datavisualization/axis/q3dcategoryaxis.h deleted file mode 100644 index 7b2b4744..00000000 --- a/src/datavisualization/axis/q3dcategoryaxis.h +++ /dev/null @@ -1,53 +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 Q3DCATEGORYAXIS_H -#define Q3DCATEGORYAXIS_H - -#include - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class Q3DCategoryAxisPrivate; - -class QT_DATAVISUALIZATION_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis -{ - Q_OBJECT - Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged) - -public: - explicit Q3DCategoryAxis(QObject *parent = 0); - virtual ~Q3DCategoryAxis(); - - void setLabels(const QStringList &labels); - QStringList labels() const; - -signals: - void labelsChanged(); - -protected: - Q3DCategoryAxisPrivate *dptr(); - -private: - Q_DISABLE_COPY(Q3DCategoryAxis) - friend class Bars3DController; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QCATEGORYAXIS_H diff --git a/src/datavisualization/axis/q3dcategoryaxis_p.h b/src/datavisualization/axis/q3dcategoryaxis_p.h deleted file mode 100644 index 9b66e48a..00000000 --- a/src/datavisualization/axis/q3dcategoryaxis_p.h +++ /dev/null @@ -1,57 +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 -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the QtDataVisualization API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#include "q3dcategoryaxis.h" -#include "q3dabstractaxis_p.h" -#include "qbardataitem.h" - -#ifndef QCATEGORYAXIS_P_H -#define QCATEGORYAXIS_P_H - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class Q3DCategoryAxisPrivate : public Q3DAbstractAxisPrivate -{ - Q_OBJECT - -public: - Q3DCategoryAxisPrivate(Q3DCategoryAxis *q); - virtual ~Q3DCategoryAxisPrivate(); - - void setDataLabels(const QStringList &labels); - -private: - Q3DCategoryAxis *qptr(); - - bool m_labelsExplicitlySet; - friend class Q3DCategoryAxis; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QCATEGORYAXIS_P_H diff --git a/src/datavisualization/axis/q3dvalueaxis.cpp b/src/datavisualization/axis/q3dvalueaxis.cpp deleted file mode 100644 index 746c8617..00000000 --- a/src/datavisualization/axis/q3dvalueaxis.cpp +++ /dev/null @@ -1,270 +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 -** -****************************************************************************/ - -#include "q3dvalueaxis.h" -#include "q3dvalueaxis_p.h" -#include "utils_p.h" - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -/*! - * \class Q3DValueAxis - * \inmodule QtDataVisualization - * \brief The Q3DValueAxis 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 - * counts to divide the range into. - * - * Labels are drawn between each segment. Grid lines are drawn between each segment and each - * subsegment. \note If visible, there will always be at least two grid lines and labels indicating - * the minimum and the maximum values of the range, as there is always at least one segment. - */ - -/*! - * \qmltype ValueAxis3D - * \inqmlmodule QtDataVisualization - * \since QtDataVisualization 1.0 - * \ingroup datavisualization_qml - * \instantiates Q3DValueAxis - * \inherits AbstractAxis3D - * \brief The ValueAxis3D type is used for manipulating an axis of a graph. - * - * This type provides an axis that can be given a range of values and segment and subsegment - * counts to divide the range into. - */ - - -/*! - * \qmlproperty int ValueAxis3D::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}. - * The preset default is \c 5, and it can not be below \c 1. - */ - -/*! - * \qmlproperty int ValueAxis3D::subSegmentCount - * - * Defines the number of subsegments inside each segment on the axis. Grid lines are drawn between - * each subsegment, in addition to each segment. - * The preset default is \c 1, and it can not be below \c 1. - */ - -/*! - * \qmlproperty string ValueAxis3D::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. - */ - -/*! - * Constructs Q3DValueAxis with the given \a parent. - */ -Q3DValueAxis::Q3DValueAxis(QObject *parent) : - Q3DAbstractAxis(new Q3DValueAxisPrivate(this), parent) -{ -} - -/*! - * Destroys Q3DValueAxis. - */ -Q3DValueAxis::~Q3DValueAxis() -{ -} - - -/*! - * \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}. - * The preset default is \c 5, and it can not be below \c 1. - * - * \sa setSubSegmentCount() - */ -void Q3DValueAxis::setSegmentCount(int count) -{ - if (count <= 0) { - qWarning() << "Warning: Illegal segment count automatically adjusted to a legal one:" - << count << "-> 1"; - count = 1; - } - if (dptr()->m_segmentCount != count){ - dptr()->m_segmentCount = count; - dptr()->emitLabelsChanged(); - emit segmentCountChanged(count); - } -} - -int Q3DValueAxis::segmentCount() const -{ - return dptrc()->m_segmentCount; -} - -/*! - * \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. - * The preset default is \c 1, and it can not be below \c 1. - * - * \sa setSegmentCount() - */ -void Q3DValueAxis::setSubSegmentCount(int count) -{ - if (count <= 0) { - qWarning() << "Warning: Illegal subsegment count automatically adjusted to a legal one:" - << count << "-> 1"; - count = 1; - } - if (dptr()->m_subSegmentCount != count) { - dptr()->m_subSegmentCount = count; - emit subSegmentCountChanged(count); - } -} - -int Q3DValueAxis::subSegmentCount() const -{ - return dptrc()->m_subSegmentCount; -} - -/*! - * \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. - * - * Usage example: - * - * \c {axis->setLabelFormat("%.2f mm");} - */ -void Q3DValueAxis::setLabelFormat(const QString &format) -{ - if (dptr()->m_labelFormat != format) { - dptr()->m_labelFormat = format; - dptr()->emitLabelsChanged(); - emit labelFormatChanged(format); - } -} - -QString Q3DValueAxis::labelFormat() const -{ - return dptrc()->m_labelFormat; -} - -/*! - * \internal - */ -Q3DValueAxisPrivate *Q3DValueAxis::dptr() -{ - return static_cast(d_ptr.data()); -} - -/*! - * \internal - */ -const Q3DValueAxisPrivate *Q3DValueAxis::dptrc() const -{ - return static_cast(d_ptr.data()); -} - -Q3DValueAxisPrivate::Q3DValueAxisPrivate(Q3DValueAxis *q) - : Q3DAbstractAxisPrivate(q, Q3DAbstractAxis::AxisTypeValue), - m_segmentCount(5), - m_subSegmentCount(1), - m_labelFormat(Utils::defaultLabelFormat()), - m_labelsDirty(true) -{ -} - -Q3DValueAxisPrivate::~Q3DValueAxisPrivate() -{ -} - -void Q3DValueAxisPrivate::setRange(float min, float max) -{ - bool dirty = (min != m_min || max != m_max); - - Q3DAbstractAxisPrivate::setRange(min, max); - - if (dirty) - emitLabelsChanged(); -} - -void Q3DValueAxisPrivate::setMin(float min) -{ - bool dirty = (min != m_min); - - Q3DAbstractAxisPrivate::setMin(min); - - if (dirty) - emitLabelsChanged(); -} - -void Q3DValueAxisPrivate::setMax(float max) -{ - bool dirty = (max != m_max); - - Q3DAbstractAxisPrivate::setMax(max); - - if (dirty) - emitLabelsChanged(); -} - -void Q3DValueAxisPrivate::emitLabelsChanged() -{ - m_labelsDirty = true; - emit q_ptr->labelsChanged(); -} - -void Q3DValueAxisPrivate::updateLabels() -{ - if (!m_labelsDirty) - return; - - m_labelsDirty = false; - - QStringList newLabels; - newLabels.reserve(m_segmentCount + 1); - - // First label is at axis min, which is an extra segment - float segmentStep = (m_max - m_min) / m_segmentCount; - - QString formatString(m_labelFormat); - Utils::ParamType paramType = Utils::findFormatParamType(formatString); - QByteArray formatArray = formatString.toUtf8(); - - for (int i = 0; i < m_segmentCount; i++) { - float value = m_min + (segmentStep * i); - newLabels.append(Utils::formatLabel(formatArray, paramType, value)); - } - - // Ensure max label doesn't suffer from any rounding errors - newLabels.append(Utils::formatLabel(formatArray, paramType, m_max)); - - if (m_labels != newLabels) - m_labels = newLabels; -} - -Q3DValueAxis *Q3DValueAxisPrivate::qptr() -{ - return static_cast(q_ptr); -} - -QT_DATAVISUALIZATION_END_NAMESPACE diff --git a/src/datavisualization/axis/q3dvalueaxis.h b/src/datavisualization/axis/q3dvalueaxis.h deleted file mode 100644 index f1280e25..00000000 --- a/src/datavisualization/axis/q3dvalueaxis.h +++ /dev/null @@ -1,65 +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 QVALUEAXIS_H -#define QVALUEAXIS_H - -#include - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class Q3DValueAxisPrivate; - -class QT_DATAVISUALIZATION_EXPORT Q3DValueAxis : public Q3DAbstractAxis -{ - Q_OBJECT - Q_PROPERTY(int segmentCount READ segmentCount WRITE setSegmentCount NOTIFY segmentCountChanged) - Q_PROPERTY(int subSegmentCount READ subSegmentCount WRITE setSubSegmentCount NOTIFY subSegmentCountChanged) - Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) - -public: - explicit Q3DValueAxis(QObject *parent = 0); - virtual ~Q3DValueAxis(); - - int segmentCount() const; - int subSegmentCount() const; - QString labelFormat() const; - - void setSegmentCount(int count); - void setSubSegmentCount(int count); - void setLabelFormat(const QString &format); - -signals: - void segmentCountChanged(int count); - void subSegmentCountChanged(int count); - void labelFormatChanged(QString format); - -protected: - Q3DValueAxisPrivate *dptr(); - const Q3DValueAxisPrivate *dptrc() const; - -private: - Q_DISABLE_COPY(Q3DValueAxis) - friend class Bars3DController; - friend class Scatter3DController; - friend class Surface3DController; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QVALUEAXIS_H diff --git a/src/datavisualization/axis/q3dvalueaxis_p.h b/src/datavisualization/axis/q3dvalueaxis_p.h deleted file mode 100644 index 0a98bb04..00000000 --- a/src/datavisualization/axis/q3dvalueaxis_p.h +++ /dev/null @@ -1,66 +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 -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the QtDataVisualization API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#include "q3dvalueaxis.h" -#include "q3dabstractaxis_p.h" - -#ifndef QVALUEAXIS_P_H -#define QVALUEAXIS_P_H - -QT_DATAVISUALIZATION_BEGIN_NAMESPACE - -class Q3DValueAxisPrivate : public Q3DAbstractAxisPrivate -{ - Q_OBJECT - -public: - Q3DValueAxisPrivate(Q3DValueAxis *q); - virtual ~Q3DValueAxisPrivate(); - - virtual void setRange(float min, float max); - virtual void setMin(float min); - virtual void setMax (float max); - -protected: - void emitLabelsChanged(); - virtual void updateLabels(); - - int m_segmentCount; - int m_subSegmentCount; - QString m_labelFormat; - bool m_labelsDirty; - -private: - Q3DValueAxis *qptr(); - - friend class Q3DValueAxis; -}; - -QT_DATAVISUALIZATION_END_NAMESPACE - -#endif // QVALUEAXIS_P_H diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp new file mode 100644 index 00000000..5f1121c4 --- /dev/null +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -0,0 +1,404 @@ +/**************************************************************************** +** +** 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 +** +****************************************************************************/ + +#include "qabstract3daxis.h" +#include "qabstract3daxis_p.h" + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +/*! + * \class QAbstract3DAxis + * \inmodule QtDataVisualization + * \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 QCategory3DAxis, QValue3DAxis + */ + +/*! + * \qmltype AbstractAxis3D + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 + * \ingroup datavisualization_qml + * \instantiates QAbstract3DAxis + * \brief AbstractAxis3D is base type for axes of a graph. + * + * This type is uncreatable, but contains properties that are exposed via subtypes. + */ + +/*! + * \qmlproperty string AbstractAxis3D::title + * Defines the title for the axis. + */ + +/*! + * \qmlproperty list AbstractAxis3D::labels + * Defines the labels for the axis. + * \note Setting this property for ValueAxis3D does nothing, as it generates labels automatically. + */ + +/*! + * \qmlproperty AbstractAxis3D.AxisOrientation AbstractAxis3D::orientation + * Defines the orientation of the axis. + */ + +/*! + * \qmlproperty AbstractAxis3D.AxisType AbstractAxis3D::type + * Defines the type of the axis. + */ + +/*! + * \qmlproperty real AbstractAxis3D::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. + */ + +/*! + * \qmlproperty real AbstractAxis3D::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. + */ + +/*! + * \qmlproperty bool AbstractAxis3D::autoAdjustRange + * + * If set, the axis will automatically adjust the range so that all data fits in it. + */ + + +/*! + * \enum QAbstract3DAxis::AxisOrientation + * + * The orientation of the axis object. + * + * \value AxisOrientationNone + * \value AxisOrientationX + * \value AxisOrientationY + * \value AxisOrientationZ + */ + +/*! + * \enum QAbstract3DAxis::AxisType + * + * The type of the axis object. + * + * \value AxisTypeNone + * \value AxisTypeCategory + * \value AxisTypeValue + */ + +/*! + * \internal + */ +QAbstract3DAxis::QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent) : + QObject(parent), + d_ptr(d) +{ +} + +/*! + * Destroys QAbstract3DAxis. + */ +QAbstract3DAxis::~QAbstract3DAxis() +{ +} + +/*! + * \property QAbstract3DAxis::orientation + * + * Defines the orientation of the axis, one of \c QAbstract3DAxis::AxisOrientation. + */ +QAbstract3DAxis::AxisOrientation QAbstract3DAxis::orientation() const +{ + return d_ptr->m_orientation; +} + +/*! + * \property QAbstract3DAxis::type + * + * Defines the type of the axis, one of \c QAbstract3DAxis::AxisType. + */ +QAbstract3DAxis::AxisType QAbstract3DAxis::type() const +{ + return d_ptr->m_type; +} + +/*! + * \property QAbstract3DAxis::title + * + * Defines the title for the axis. + */ +void QAbstract3DAxis::setTitle(QString title) +{ + if (d_ptr->m_title != title) { + d_ptr->m_title = title; + emit titleChanged(title); + } +} + +QString QAbstract3DAxis::title() const +{ + return d_ptr->m_title; +} + +/*! + * \property QAbstract3DAxis::labels + * + * Defines the labels for the axis. + * \note Setting this property for QValue3DAxis does nothing, as it generates labels automatically. + */ +void QAbstract3DAxis::setLabels(const QStringList &labels) +{ + Q_UNUSED(labels) +} + +QStringList QAbstract3DAxis::labels() const +{ + d_ptr->updateLabels(); + return d_ptr->m_labels; +} + +/*! + * 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 QCategory3DAxis this specifies the index range of rows or columns to show. + */ +void QAbstract3DAxis::setRange(float min, float max) +{ + d_ptr->setRange(min, max); + setAutoAdjustRange(false); +} + +/*! + * \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 QCategory3DAxis this specifies the index of the first row or column to show. + */ +void QAbstract3DAxis::setMin(float min) +{ + d_ptr->setMin(min); + setAutoAdjustRange(false); +} + +/*! + * \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 QCategory3DAxis this specifies the index of the last row or column to show. + */ +void QAbstract3DAxis::setMax(float max) +{ + d_ptr->setMax(max); + setAutoAdjustRange(false); +} + +float QAbstract3DAxis::min() const +{ + return d_ptr->m_min; +} + +float QAbstract3DAxis::max() const +{ + return d_ptr->m_max; +} + +/*! + * \property QAbstract3DAxis::autoAdjustRange + * + * If set, the axis will automatically adjust the range so that all data fits in it. + * + * \sa setRange(), setMin(), setMax() + */ +void QAbstract3DAxis::setAutoAdjustRange(bool autoAdjust) +{ + if (d_ptr->m_autoAdjust != autoAdjust) { + d_ptr->m_autoAdjust = autoAdjust; + emit autoAdjustRangeChanged(autoAdjust); + } +} + +bool QAbstract3DAxis::isAutoAdjustRange() const +{ + return d_ptr->m_autoAdjust; +} + +/*! + * \fn QAbstract3DAxis::rangeChanged(float min, float max) + * + * Emits range \a min and \a max values when range changes. + */ + +// QAbstract3DAxisPrivate + +QAbstract3DAxisPrivate::QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type) + : QObject(0), + q_ptr(q), + m_orientation(QAbstract3DAxis::AxisOrientationNone), + m_type(type), + m_isDefaultAxis(false), + m_min(0.0f), + m_max(10.0f), + m_autoAdjust(true), + m_onlyPositiveValues(false), + m_allowMinMaxSame(false) +{ +} + +QAbstract3DAxisPrivate::~QAbstract3DAxisPrivate() +{ +} + +void QAbstract3DAxisPrivate::setOrientation(QAbstract3DAxis::AxisOrientation orientation) +{ + if (m_orientation == QAbstract3DAxis::AxisOrientationNone) { + m_orientation = orientation; + emit q_ptr->orientationChanged(orientation); + } else { + Q_ASSERT("Attempted to reset axis orientation."); + } +} + +void QAbstract3DAxisPrivate::updateLabels() +{ + // Default implementation does nothing +} + +void QAbstract3DAxisPrivate::setRange(float min, float max) +{ + bool adjusted = false; + if (m_onlyPositiveValues) { + if (min < 0.0f) { + min = 0.0f; + adjusted = true; + } + if (max < 0.0f) { + max = 0.0f; + adjusted = true; + } + } + // If min >= max, we adjust ranges so that + // m_max becomes (min + 1.0f) + // as axes need some kind of valid range. + bool minDirty = false; + bool maxDirty = false; + if (m_min != min) { + m_min = min; + minDirty = true; + } + if (m_max != max || min > max || (!m_allowMinMaxSame && min == max)) { + if (min > max || (!m_allowMinMaxSame && min == max)) { + m_max = min + 1.0f; + adjusted = true; + } else { + m_max = max; + } + maxDirty = true; + } + + if (minDirty || maxDirty) { + if (adjusted) { + qWarning() << "Warning: Tried to set invalid range for axis." + " Range automatically adjusted to a valid one:" + << min << "-" << max << "-->" << m_min << "-" << m_max; + } + emit q_ptr->rangeChanged(m_min, m_max); + } + + if (minDirty) + emit q_ptr->minChanged(m_min); + if (maxDirty) + emit q_ptr->maxChanged(m_max); +} + +void QAbstract3DAxisPrivate::setMin(float min) +{ + if (m_onlyPositiveValues) { + if (min < 0.0f) { + min = 0.0f; + qWarning() << "Warning: Tried to set negative minimum for an axis that only supports" + " positive values:" << min; + } + } + + if (m_min != min) { + bool maxChanged = false; + if (min > m_max || (!m_allowMinMaxSame && min == m_max)) { + float oldMax = m_max; + m_max = min + 1.0f; + qWarning() << "Warning: Tried to set minimum to equal or larger than maximum for" + " value axis. Maximum automatically adjusted to a valid one:" + << oldMax << "-->" << m_max; + maxChanged = true; + } + m_min = min; + + emit q_ptr->rangeChanged(m_min, m_max); + emit q_ptr->minChanged(m_min); + if (maxChanged) + emit q_ptr->maxChanged(m_max); + } +} + +void QAbstract3DAxisPrivate::setMax(float max) +{ + if (m_onlyPositiveValues) { + if (max < 0.0f) { + max = 0.0f; + qWarning() << "Warning: Tried to set negative maximum for an axis that only supports" + " positive values:" << max; + } + } + + if (m_max != max) { + bool minChanged = false; + if (m_min > max || (!m_allowMinMaxSame && m_min == max)) { + float oldMin = m_min; + m_min = max - 1.0f; + if (m_onlyPositiveValues && m_min < 0.0f) { + m_min = 0.0f; + if (!m_allowMinMaxSame && max == 0.0f) { + m_min = oldMin; + qWarning() << "Unable to set maximum value to zero."; + return; + } + } + qWarning() << "Warning: Tried to set maximum to equal or smaller than minimum for" + " value axis. Minimum automatically adjusted to a valid one:" + << oldMin << "-->" << m_min; + minChanged = true; + } + m_max = max; + emit q_ptr->rangeChanged(m_min, m_max); + emit q_ptr->maxChanged(m_max); + if (minChanged) + emit q_ptr->minChanged(m_min); + } +} + +QT_DATAVISUALIZATION_END_NAMESPACE diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h new file mode 100644 index 00000000..ef9f9c78 --- /dev/null +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -0,0 +1,107 @@ +/**************************************************************************** +** +** 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 QABSTRACT3DAXIS_H +#define QABSTRACT3DAXIS_H + +#include +#include +#include +#include +#include + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QAbstract3DAxisPrivate; + +class QT_DATAVISUALIZATION_EXPORT QAbstract3DAxis : 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 QAbstract3DAxis(QAbstract3DAxisPrivate *d, QObject *parent = 0); + +public: + virtual ~QAbstract3DAxis(); + + 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 d_ptr; + +private: + Q_DISABLE_COPY(QAbstract3DAxis) + + friend class Abstract3DController; + friend class Bars3DController; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h new file mode 100644 index 00000000..da6964ad --- /dev/null +++ b/src/datavisualization/axis/qabstract3daxis_p.h @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** 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 +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QtDataVisualization API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#include "datavisualizationglobal_p.h" +#include "qabstract3daxis.h" +#include "abstract3dcontroller_p.h" + +#ifndef QABSTRACT3DAXIS_P_H +#define QABSTRACT3DAXIS_P_H + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QAbstract3DAxisPrivate : public QObject +{ + Q_OBJECT +public: + QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type); + virtual ~QAbstract3DAxisPrivate(); + + void setOrientation(QAbstract3DAxis::AxisOrientation orientation); + + inline bool isDefaultAxis() { return m_isDefaultAxis; } + inline void setDefaultAxis(bool isDefault) { m_isDefaultAxis = isDefault; } + + virtual void setRange(float min, float max); + virtual void setMin(float min); + virtual void setMax (float max); + +protected: + virtual void updateLabels(); + + QAbstract3DAxis *q_ptr; + + QString m_title; + QStringList m_labels; + QAbstract3DAxis::AxisOrientation m_orientation; + QAbstract3DAxis::AxisType m_type; + bool m_isDefaultAxis; + float m_min; + float m_max; + bool m_autoAdjust; + bool m_onlyPositiveValues; + bool m_allowMinMaxSame; + + friend class QAbstract3DAxis; + friend class QValue3DAxis; + friend class QCategory3DAxis; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp new file mode 100644 index 00000000..b5999aaa --- /dev/null +++ b/src/datavisualization/axis/qcategory3daxis.cpp @@ -0,0 +1,156 @@ +/**************************************************************************** +** +** 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 +** +****************************************************************************/ + +#include "qcategory3daxis.h" +#include "qcategory3daxis_p.h" +#include "bars3dcontroller_p.h" +#include "qbardataproxy.h" + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +/*! + * \class QCategory3DAxis + * \inmodule QtDataVisualization + * \brief The QCategory3DAxis class is used for manipulating an axis of a graph. + * \since Qt Data Visualization 1.0 + * + * 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 + * if provided. + */ + +/*! + * \qmltype CategoryAxis3D + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 + * \ingroup datavisualization_qml + * \instantiates QCategory3DAxis + * \inherits AbstractAxis3D + * \brief The CategoryAxis3D type is used for manipulating an axis of a graph. + * + * This type provides an axis that can be given labels. + */ + +/*! + * \qmlproperty list CategoryAxis3D::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. + */ + +/*! + * Constructs QCategory3DAxis with \a parent. + */ +QCategory3DAxis::QCategory3DAxis(QObject *parent) : + QAbstract3DAxis(new QCategory3DAxisPrivate(this), parent) +{ + connect(this, &QCategory3DAxis::labelsChanged, this, &QAbstract3DAxis::labelsChanged); +} + +/*! + * Destroys QCategory3DAxis. + */ +QCategory3DAxis::~QCategory3DAxis() +{ +} + +/*! + * \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. + */ +QStringList QCategory3DAxis::labels() const +{ + return QAbstract3DAxis::labels(); +} + +void QCategory3DAxis::setLabels(const QStringList &labels) +{ + dptr()->m_labelsExplicitlySet = !labels.isEmpty(); + bool labelsFromData = false; + + // Get labels from data proxy if axis is attached to a bar controller and an active axis there + if (labels.isEmpty()) { + Bars3DController *controller = qobject_cast(parent()); + if (controller) { + if (controller->axisX() == this) { + controller->handleDataRowLabelsChanged(); + labelsFromData = true; + } else if (controller->axisZ() == this) { + controller->handleDataColumnLabelsChanged(); + labelsFromData = true; + } + } + } + + if (!labelsFromData && d_ptr->m_labels != labels) { + d_ptr->m_labels = labels; + emit labelsChanged(); + } +} + +/*! + * \internal + */ +QCategory3DAxisPrivate *QCategory3DAxis::dptr() +{ + return static_cast(d_ptr.data()); +} + +QCategory3DAxisPrivate::QCategory3DAxisPrivate(QCategory3DAxis *q) + : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeCategory), + m_labelsExplicitlySet(false) +{ + m_onlyPositiveValues = true; + m_allowMinMaxSame = true; +} + +QCategory3DAxisPrivate::~QCategory3DAxisPrivate() +{ +} + +/*! + * \internal + * 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 QCategory3DAxisPrivate::setDataLabels(const QStringList &labels) +{ + if (!m_labelsExplicitlySet && m_labels != labels) { + m_labels = labels; + emit qptr()->labelsChanged(); + } +} + +QCategory3DAxis *QCategory3DAxisPrivate::qptr() +{ + return static_cast(q_ptr); +} + +QT_DATAVISUALIZATION_END_NAMESPACE diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h new file mode 100644 index 00000000..fdedf795 --- /dev/null +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** 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 QCATEGORY3DAXIS_H +#define QCATEGORY3DAXIS_H + +#include + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QCategory3DAxisPrivate; + +class QT_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis +{ + Q_OBJECT + Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged) + +public: + explicit QCategory3DAxis(QObject *parent = 0); + virtual ~QCategory3DAxis(); + + void setLabels(const QStringList &labels); + QStringList labels() const; + +signals: + void labelsChanged(); + +protected: + QCategory3DAxisPrivate *dptr(); + +private: + Q_DISABLE_COPY(QCategory3DAxis) + friend class Bars3DController; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h new file mode 100644 index 00000000..dfcc9961 --- /dev/null +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** 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 +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QtDataVisualization API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#include "qcategory3daxis.h" +#include "qabstract3daxis_p.h" +#include "qbardataitem.h" + +#ifndef QCATEGORY3DAXIS_P_H +#define QCATEGORY3DAXIS_P_H + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate +{ + Q_OBJECT + +public: + QCategory3DAxisPrivate(QCategory3DAxis *q); + virtual ~QCategory3DAxisPrivate(); + + void setDataLabels(const QStringList &labels); + +private: + QCategory3DAxis *qptr(); + + bool m_labelsExplicitlySet; + friend class QCategory3DAxis; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp new file mode 100644 index 00000000..a88a9ef5 --- /dev/null +++ b/src/datavisualization/axis/qvalue3daxis.cpp @@ -0,0 +1,270 @@ +/**************************************************************************** +** +** 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 +** +****************************************************************************/ + +#include "qvalue3daxis.h" +#include "qvalue3daxis_p.h" +#include "utils_p.h" + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +/*! + * \class QValue3DAxis + * \inmodule QtDataVisualization + * \brief The QValue3DAxis class is used for manipulating an axis of a graph. + * \since Qt Data Visualization 1.0 + * + * 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 + * subsegment. \note If visible, there will always be at least two grid lines and labels indicating + * the minimum and the maximum values of the range, as there is always at least one segment. + */ + +/*! + * \qmltype ValueAxis3D + * \inqmlmodule QtDataVisualization + * \since QtDataVisualization 1.0 + * \ingroup datavisualization_qml + * \instantiates QValue3DAxis + * \inherits AbstractAxis3D + * \brief The ValueAxis3D type is used for manipulating an axis of a graph. + * + * This type provides an axis that can be given a range of values and segment and subsegment + * counts to divide the range into. + */ + + +/*! + * \qmlproperty int ValueAxis3D::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}. + * The preset default is \c 5, and it can not be below \c 1. + */ + +/*! + * \qmlproperty int ValueAxis3D::subSegmentCount + * + * Defines the number of subsegments inside each segment on the axis. Grid lines are drawn between + * each subsegment, in addition to each segment. + * The preset default is \c 1, and it can not be below \c 1. + */ + +/*! + * \qmlproperty string ValueAxis3D::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. + */ + +/*! + * Constructs QValue3DAxis with the given \a parent. + */ +QValue3DAxis::QValue3DAxis(QObject *parent) : + QAbstract3DAxis(new QValue3DAxisPrivate(this), parent) +{ +} + +/*! + * Destroys QValue3DAxis. + */ +QValue3DAxis::~QValue3DAxis() +{ +} + + +/*! + * \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}. + * The preset default is \c 5, and it can not be below \c 1. + * + * \sa setSubSegmentCount() + */ +void QValue3DAxis::setSegmentCount(int count) +{ + if (count <= 0) { + qWarning() << "Warning: Illegal segment count automatically adjusted to a legal one:" + << count << "-> 1"; + count = 1; + } + if (dptr()->m_segmentCount != count){ + dptr()->m_segmentCount = count; + dptr()->emitLabelsChanged(); + emit segmentCountChanged(count); + } +} + +int QValue3DAxis::segmentCount() const +{ + return dptrc()->m_segmentCount; +} + +/*! + * \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. + * The preset default is \c 1, and it can not be below \c 1. + * + * \sa setSegmentCount() + */ +void QValue3DAxis::setSubSegmentCount(int count) +{ + if (count <= 0) { + qWarning() << "Warning: Illegal subsegment count automatically adjusted to a legal one:" + << count << "-> 1"; + count = 1; + } + if (dptr()->m_subSegmentCount != count) { + dptr()->m_subSegmentCount = count; + emit subSegmentCountChanged(count); + } +} + +int QValue3DAxis::subSegmentCount() const +{ + return dptrc()->m_subSegmentCount; +} + +/*! + * \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. + * + * Usage example: + * + * \c {axis->setLabelFormat("%.2f mm");} + */ +void QValue3DAxis::setLabelFormat(const QString &format) +{ + if (dptr()->m_labelFormat != format) { + dptr()->m_labelFormat = format; + dptr()->emitLabelsChanged(); + emit labelFormatChanged(format); + } +} + +QString QValue3DAxis::labelFormat() const +{ + return dptrc()->m_labelFormat; +} + +/*! + * \internal + */ +QValue3DAxisPrivate *QValue3DAxis::dptr() +{ + return static_cast(d_ptr.data()); +} + +/*! + * \internal + */ +const QValue3DAxisPrivate *QValue3DAxis::dptrc() const +{ + return static_cast(d_ptr.data()); +} + +QValue3DAxisPrivate::QValue3DAxisPrivate(QValue3DAxis *q) + : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeValue), + m_segmentCount(5), + m_subSegmentCount(1), + m_labelFormat(Utils::defaultLabelFormat()), + m_labelsDirty(true) +{ +} + +QValue3DAxisPrivate::~QValue3DAxisPrivate() +{ +} + +void QValue3DAxisPrivate::setRange(float min, float max) +{ + bool dirty = (min != m_min || max != m_max); + + QAbstract3DAxisPrivate::setRange(min, max); + + if (dirty) + emitLabelsChanged(); +} + +void QValue3DAxisPrivate::setMin(float min) +{ + bool dirty = (min != m_min); + + QAbstract3DAxisPrivate::setMin(min); + + if (dirty) + emitLabelsChanged(); +} + +void QValue3DAxisPrivate::setMax(float max) +{ + bool dirty = (max != m_max); + + QAbstract3DAxisPrivate::setMax(max); + + if (dirty) + emitLabelsChanged(); +} + +void QValue3DAxisPrivate::emitLabelsChanged() +{ + m_labelsDirty = true; + emit q_ptr->labelsChanged(); +} + +void QValue3DAxisPrivate::updateLabels() +{ + if (!m_labelsDirty) + return; + + m_labelsDirty = false; + + QStringList newLabels; + newLabels.reserve(m_segmentCount + 1); + + // First label is at axis min, which is an extra segment + float segmentStep = (m_max - m_min) / m_segmentCount; + + QString formatString(m_labelFormat); + Utils::ParamType paramType = Utils::findFormatParamType(formatString); + QByteArray formatArray = formatString.toUtf8(); + + for (int i = 0; i < m_segmentCount; i++) { + float value = m_min + (segmentStep * i); + newLabels.append(Utils::formatLabel(formatArray, paramType, value)); + } + + // Ensure max label doesn't suffer from any rounding errors + newLabels.append(Utils::formatLabel(formatArray, paramType, m_max)); + + if (m_labels != newLabels) + m_labels = newLabels; +} + +QValue3DAxis *QValue3DAxisPrivate::qptr() +{ + return static_cast(q_ptr); +} + +QT_DATAVISUALIZATION_END_NAMESPACE diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h new file mode 100644 index 00000000..3bdeb678 --- /dev/null +++ b/src/datavisualization/axis/qvalue3daxis.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 QVALUE3DAXIS_H +#define QVALUE3DAXIS_H + +#include + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QValue3DAxisPrivate; + +class QT_DATAVISUALIZATION_EXPORT QValue3DAxis : public QAbstract3DAxis +{ + Q_OBJECT + Q_PROPERTY(int segmentCount READ segmentCount WRITE setSegmentCount NOTIFY segmentCountChanged) + Q_PROPERTY(int subSegmentCount READ subSegmentCount WRITE setSubSegmentCount NOTIFY subSegmentCountChanged) + Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) + +public: + explicit QValue3DAxis(QObject *parent = 0); + virtual ~QValue3DAxis(); + + int segmentCount() const; + int subSegmentCount() const; + QString labelFormat() const; + + void setSegmentCount(int count); + void setSubSegmentCount(int count); + void setLabelFormat(const QString &format); + +signals: + void segmentCountChanged(int count); + void subSegmentCountChanged(int count); + void labelFormatChanged(QString format); + +protected: + QValue3DAxisPrivate *dptr(); + const QValue3DAxisPrivate *dptrc() const; + +private: + Q_DISABLE_COPY(QValue3DAxis) + friend class Bars3DController; + friend class Scatter3DController; + friend class Surface3DController; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h new file mode 100644 index 00000000..508453e8 --- /dev/null +++ b/src/datavisualization/axis/qvalue3daxis_p.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** 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 +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QtDataVisualization API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#include "qvalue3daxis.h" +#include "qabstract3daxis_p.h" + +#ifndef QVALUE3DAXIS_P_H +#define QVALUE3DAXIS_P_H + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QValue3DAxisPrivate : public QAbstract3DAxisPrivate +{ + Q_OBJECT + +public: + QValue3DAxisPrivate(QValue3DAxis *q); + virtual ~QValue3DAxisPrivate(); + + virtual void setRange(float min, float max); + virtual void setMin(float min); + virtual void setMax (float max); + +protected: + void emitLabelsChanged(); + virtual void updateLabels(); + + int m_segmentCount; + int m_subSegmentCount; + QString m_labelFormat; + bool m_labelsDirty; + +private: + QValue3DAxis *qptr(); + + friend class QValue3DAxis; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp index 18e8b2ed..357feca6 100644 --- a/src/datavisualization/data/qbar3dseries.cpp +++ b/src/datavisualization/data/qbar3dseries.cpp @@ -51,7 +51,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \li @colLabel \li Label from column axis * \row * \li @valueLabel \li Item value formatted using the same format the value axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \row * \li % \li Item value in specified format. * \endtable diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 80768059..71680ff2 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -38,7 +38,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * If you use QBarDataRow pointers to directly modify data after adding the array to the proxy, * you must also emit proper signal to make the graph update. * - * QBarDataProxy optionally keeps track of row and column labels, which Q3DCategoryAxis can utilize + * QBarDataProxy optionally keeps track of row and column labels, which QCategory3DAxis can utilize * to show axis labels. The row and column labels are stored in separate array from the data and * row manipulation methods provide an alternate versions that don't affect the row labels. * This enables the option of having row labels that relate to the position of the data in the diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp index 47971f5f..8604c3f0 100644 --- a/src/datavisualization/data/qscatter3dseries.cpp +++ b/src/datavisualization/data/qscatter3dseries.cpp @@ -43,13 +43,13 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \li @zTitle \li Title from Z axis * \row * \li @xLabel \li Item value formatted using the same format the X axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \row * \li @yLabel \li Item value formatted using the same format the Y axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \row * \li @zLabel \li Item value formatted using the same format the Z axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \endtable * * For example: diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp index cf794077..1d456243 100644 --- a/src/datavisualization/data/qsurface3dseries.cpp +++ b/src/datavisualization/data/qsurface3dseries.cpp @@ -46,13 +46,13 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \li @zTitle \li Title from Z axis * \row * \li @xLabel \li Item value formatted using the same format as the X axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \row * \li @yLabel \li Item value formatted using the same format as the Y axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \row * \li @zLabel \li Item value formatted using the same format as the Z axis attached to the graph uses, - * see \l{Q3DValueAxis::setLabelFormat()} for more information. + * see \l{QValue3DAxis::setLabelFormat()} for more information. * \endtable * * For example: diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index fb732139..09c75ceb 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -18,9 +18,9 @@ #include "abstract3dcontroller_p.h" #include "camerahelper_p.h" -#include "q3dabstractaxis_p.h" -#include "q3dvalueaxis.h" -#include "q3dcategoryaxis.h" +#include "qabstract3daxis_p.h" +#include "qvalue3daxis.h" +#include "qcategory3daxis.h" #include "abstract3drenderer_p.h" #include "q3dcamera.h" #include "q3dlight.h" @@ -148,144 +148,144 @@ void Abstract3DController::synchDataToRenderer() } if (m_changeTracker.axisXTypeChanged) { - m_renderer->updateAxisType(Q3DAbstractAxis::AxisOrientationX, m_axisX->type()); + m_renderer->updateAxisType(QAbstract3DAxis::AxisOrientationX, m_axisX->type()); m_changeTracker.axisXTypeChanged = false; } if (m_changeTracker.axisYTypeChanged) { - m_renderer->updateAxisType(Q3DAbstractAxis::AxisOrientationY, m_axisY->type()); + m_renderer->updateAxisType(QAbstract3DAxis::AxisOrientationY, m_axisY->type()); m_changeTracker.axisYTypeChanged = false; } if (m_changeTracker.axisZTypeChanged) { - m_renderer->updateAxisType(Q3DAbstractAxis::AxisOrientationZ, m_axisZ->type()); + m_renderer->updateAxisType(QAbstract3DAxis::AxisOrientationZ, m_axisZ->type()); m_changeTracker.axisZTypeChanged = false; } if (m_changeTracker.axisXTitleChanged) { - m_renderer->updateAxisTitle(Q3DAbstractAxis::AxisOrientationX, m_axisX->title()); + m_renderer->updateAxisTitle(QAbstract3DAxis::AxisOrientationX, m_axisX->title()); m_changeTracker.axisXTitleChanged = false; } if (m_changeTracker.axisYTitleChanged) { - m_renderer->updateAxisTitle(Q3DAbstractAxis::AxisOrientationY, m_axisY->title()); + m_renderer->updateAxisTitle(QAbstract3DAxis::AxisOrientationY, m_axisY->title()); m_changeTracker.axisYTitleChanged = false; } if (m_changeTracker.axisZTitleChanged) { - m_renderer->updateAxisTitle(Q3DAbstractAxis::AxisOrientationZ, m_axisZ->title()); + m_renderer->updateAxisTitle(QAbstract3DAxis::AxisOrientationZ, m_axisZ->title()); m_changeTracker.axisZTitleChanged = false; } if (m_changeTracker.axisXLabelsChanged) { - m_renderer->updateAxisLabels(Q3DAbstractAxis::AxisOrientationX, m_axisX->labels()); + m_renderer->updateAxisLabels(QAbstract3DAxis::AxisOrientationX, m_axisX->labels()); m_changeTracker.axisXLabelsChanged = false; } if (m_changeTracker.axisYLabelsChanged) { - m_renderer->updateAxisLabels(Q3DAbstractAxis::AxisOrientationY, m_axisY->labels()); + m_renderer->updateAxisLabels(QAbstract3DAxis::AxisOrientationY, m_axisY->labels()); m_changeTracker.axisYLabelsChanged = false; } if (m_changeTracker.axisZLabelsChanged) { - m_renderer->updateAxisLabels(Q3DAbstractAxis::AxisOrientationZ, m_axisZ->labels()); + m_renderer->updateAxisLabels(QAbstract3DAxis::AxisOrientationZ, m_axisZ->labels()); m_changeTracker.axisZLabelsChanged = false; } if (m_changeTracker.axisXRangeChanged) { - m_renderer->updateAxisRange(Q3DAbstractAxis::AxisOrientationX, m_axisX->min(), + m_renderer->updateAxisRange(QAbstract3DAxis::AxisOrientationX, m_axisX->min(), m_axisX->max()); m_changeTracker.axisXRangeChanged = false; } if (m_changeTracker.axisYRangeChanged) { - m_renderer->updateAxisRange(Q3DAbstractAxis::AxisOrientationY, m_axisY->min(), + m_renderer->updateAxisRange(QAbstract3DAxis::AxisOrientationY, m_axisY->min(), m_axisY->max()); m_changeTracker.axisYRangeChanged = false; } if (m_changeTracker.axisZRangeChanged) { - m_renderer->updateAxisRange(Q3DAbstractAxis::AxisOrientationZ, m_axisZ->min(), + m_renderer->updateAxisRange(QAbstract3DAxis::AxisOrientationZ, m_axisZ->min(), m_axisZ->max()); m_changeTracker.axisZRangeChanged = false; } if (m_changeTracker.axisXSegmentCountChanged) { m_changeTracker.axisXSegmentCountChanged = false; - if (m_axisX->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisX = static_cast(m_axisX); - m_renderer->updateAxisSegmentCount(Q3DAbstractAxis::AxisOrientationX, + if (m_axisX->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisX = static_cast(m_axisX); + m_renderer->updateAxisSegmentCount(QAbstract3DAxis::AxisOrientationX, valueAxisX->segmentCount()); } } if (m_changeTracker.axisYSegmentCountChanged) { m_changeTracker.axisYSegmentCountChanged = false; - if (m_axisY->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisY = static_cast(m_axisY); - m_renderer->updateAxisSegmentCount(Q3DAbstractAxis::AxisOrientationY, + if (m_axisY->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisY = static_cast(m_axisY); + m_renderer->updateAxisSegmentCount(QAbstract3DAxis::AxisOrientationY, valueAxisY->segmentCount()); } } if (m_changeTracker.axisZSegmentCountChanged) { m_changeTracker.axisZSegmentCountChanged = false; - if (m_axisZ->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisZ = static_cast(m_axisZ); - m_renderer->updateAxisSegmentCount(Q3DAbstractAxis::AxisOrientationZ, + if (m_axisZ->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisZ = static_cast(m_axisZ); + m_renderer->updateAxisSegmentCount(QAbstract3DAxis::AxisOrientationZ, valueAxisZ->segmentCount()); } } if (m_changeTracker.axisXSubSegmentCountChanged) { m_changeTracker.axisXSubSegmentCountChanged = false; - if (m_axisX->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisX = static_cast(m_axisX); - m_renderer->updateAxisSubSegmentCount(Q3DAbstractAxis::AxisOrientationX, + if (m_axisX->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisX = static_cast(m_axisX); + m_renderer->updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientationX, valueAxisX->subSegmentCount()); } } if (m_changeTracker.axisYSubSegmentCountChanged) { m_changeTracker.axisYSubSegmentCountChanged = false; - if (m_axisY->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisY = static_cast(m_axisY); - m_renderer->updateAxisSubSegmentCount(Q3DAbstractAxis::AxisOrientationY, + if (m_axisY->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisY = static_cast(m_axisY); + m_renderer->updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientationY, valueAxisY->subSegmentCount()); } } if (m_changeTracker.axisZSubSegmentCountChanged) { m_changeTracker.axisZSubSegmentCountChanged = false; - if (m_axisZ->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisZ = static_cast(m_axisZ); - m_renderer->updateAxisSubSegmentCount(Q3DAbstractAxis::AxisOrientationZ, + if (m_axisZ->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisZ = static_cast(m_axisZ); + m_renderer->updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientationZ, valueAxisZ->subSegmentCount()); } } if (m_changeTracker.axisXLabelFormatChanged) { m_changeTracker.axisXLabelFormatChanged = false; - if (m_axisX->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisX = static_cast(m_axisX); - m_renderer->updateAxisLabelFormat(Q3DAbstractAxis::AxisOrientationX, + if (m_axisX->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisX = static_cast(m_axisX); + m_renderer->updateAxisLabelFormat(QAbstract3DAxis::AxisOrientationX, valueAxisX->labelFormat()); } } if (m_changeTracker.axisYLabelFormatChanged) { m_changeTracker.axisYLabelFormatChanged = false; - if (m_axisY->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisY = static_cast(m_axisY); - m_renderer->updateAxisLabelFormat(Q3DAbstractAxis::AxisOrientationY, + if (m_axisY->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisY = static_cast(m_axisY); + m_renderer->updateAxisLabelFormat(QAbstract3DAxis::AxisOrientationY, valueAxisY->labelFormat()); } } if (m_changeTracker.axisZLabelFormatChanged) { m_changeTracker.axisZLabelFormatChanged = false; - if (m_axisZ->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxisZ = static_cast(m_axisZ); - m_renderer->updateAxisLabelFormat(Q3DAbstractAxis::AxisOrientationZ, + if (m_axisZ->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxisZ = static_cast(m_axisZ); + m_renderer->updateAxisLabelFormat(QAbstract3DAxis::AxisOrientationZ, valueAxisZ->labelFormat()); } } @@ -459,37 +459,37 @@ void Abstract3DController::handleThemeTypeChanged(Q3DTheme::Theme theme) markSeriesVisualsDirty(); } -void Abstract3DController::setAxisX(Q3DAbstractAxis *axis) +void Abstract3DController::setAxisX(QAbstract3DAxis *axis) { - setAxisHelper(Q3DAbstractAxis::AxisOrientationX, axis, &m_axisX); + setAxisHelper(QAbstract3DAxis::AxisOrientationX, axis, &m_axisX); } -Q3DAbstractAxis *Abstract3DController::axisX() +QAbstract3DAxis *Abstract3DController::axisX() { return m_axisX; } -void Abstract3DController::setAxisY(Q3DAbstractAxis *axis) +void Abstract3DController::setAxisY(QAbstract3DAxis *axis) { - setAxisHelper(Q3DAbstractAxis::AxisOrientationY, axis, &m_axisY); + setAxisHelper(QAbstract3DAxis::AxisOrientationY, axis, &m_axisY); } -Q3DAbstractAxis *Abstract3DController::axisY() +QAbstract3DAxis *Abstract3DController::axisY() { return m_axisY; } -void Abstract3DController::setAxisZ(Q3DAbstractAxis *axis) +void Abstract3DController::setAxisZ(QAbstract3DAxis *axis) { - setAxisHelper(Q3DAbstractAxis::AxisOrientationZ, axis, &m_axisZ); + setAxisHelper(QAbstract3DAxis::AxisOrientationZ, axis, &m_axisZ); } -Q3DAbstractAxis *Abstract3DController::axisZ() +QAbstract3DAxis *Abstract3DController::axisZ() { return m_axisZ; } -void Abstract3DController::addAxis(Q3DAbstractAxis *axis) +void Abstract3DController::addAxis(QAbstract3DAxis *axis) { Q_ASSERT(axis); Abstract3DController *owner = qobject_cast(axis->parent()); @@ -501,7 +501,7 @@ void Abstract3DController::addAxis(Q3DAbstractAxis *axis) m_axes.append(axis); } -void Abstract3DController::releaseAxis(Q3DAbstractAxis *axis) +void Abstract3DController::releaseAxis(QAbstract3DAxis *axis) { if (axis && m_axes.contains(axis)) { // Clear the default status from released default axes @@ -510,13 +510,13 @@ void Abstract3DController::releaseAxis(Q3DAbstractAxis *axis) // If the axis is in use, replace it with a temporary one switch (axis->orientation()) { - case Q3DAbstractAxis::AxisOrientationX: + case QAbstract3DAxis::AxisOrientationX: setAxisX(0); break; - case Q3DAbstractAxis::AxisOrientationY: + case QAbstract3DAxis::AxisOrientationY: setAxisY(0); break; - case Q3DAbstractAxis::AxisOrientationZ: + case QAbstract3DAxis::AxisOrientationZ: setAxisZ(0); break; default: @@ -528,7 +528,7 @@ void Abstract3DController::releaseAxis(Q3DAbstractAxis *axis) } } -QList Abstract3DController::axes() const +QList Abstract3DController::axes() const { return m_axes; } @@ -810,7 +810,7 @@ void Abstract3DController::handleAxisAutoAdjustRangeChanged(bool autoAdjust) if (sender != m_axisX && sender != m_axisY && sender != m_axisZ) return; - Q3DAbstractAxis *axis = static_cast(sender); + QAbstract3DAxis *axis = static_cast(sender); handleAxisAutoAdjustRangeChangedInOrientation(axis->orientation(), autoAdjust); } @@ -879,15 +879,15 @@ void Abstract3DController::handleSeriesVisibilityChangedBySender(QObject *sender emitNeedRender(); } -void Abstract3DController::setAxisHelper(Q3DAbstractAxis::AxisOrientation orientation, - Q3DAbstractAxis *axis, Q3DAbstractAxis **axisPtr) +void Abstract3DController::setAxisHelper(QAbstract3DAxis::AxisOrientation orientation, + QAbstract3DAxis *axis, QAbstract3DAxis **axisPtr) { // Setting null axis indicates using default axis if (!axis) axis = createDefaultAxis(orientation); // If old axis is default axis, delete it - Q3DAbstractAxis *oldAxis = *axisPtr; + QAbstract3DAxis *oldAxis = *axisPtr; if (oldAxis) { if (oldAxis->d_ptr->isDefaultAxis()) { m_axes.removeAll(oldAxis); @@ -896,7 +896,7 @@ void Abstract3DController::setAxisHelper(Q3DAbstractAxis::AxisOrientation orient } else { // Disconnect the old axis from use QObject::disconnect(oldAxis, 0, this, 0); - oldAxis->d_ptr->setOrientation(Q3DAbstractAxis::AxisOrientationNone); + oldAxis->d_ptr->setOrientation(QAbstract3DAxis::AxisOrientationNone); } } @@ -908,20 +908,20 @@ void Abstract3DController::setAxisHelper(Q3DAbstractAxis::AxisOrientation orient axis->d_ptr->setOrientation(orientation); - QObject::connect(axis, &Q3DAbstractAxis::titleChanged, + QObject::connect(axis, &QAbstract3DAxis::titleChanged, this, &Abstract3DController::handleAxisTitleChanged); - QObject::connect(axis, &Q3DAbstractAxis::labelsChanged, + QObject::connect(axis, &QAbstract3DAxis::labelsChanged, this, &Abstract3DController::handleAxisLabelsChanged); - QObject::connect(axis, &Q3DAbstractAxis::rangeChanged, + QObject::connect(axis, &QAbstract3DAxis::rangeChanged, this, &Abstract3DController::handleAxisRangeChanged); - QObject::connect(axis, &Q3DAbstractAxis::autoAdjustRangeChanged, + QObject::connect(axis, &QAbstract3DAxis::autoAdjustRangeChanged, this, &Abstract3DController::handleAxisAutoAdjustRangeChanged); - if (orientation == Q3DAbstractAxis::AxisOrientationX) + if (orientation == QAbstract3DAxis::AxisOrientationX) m_changeTracker.axisXTypeChanged = true; - else if (orientation == Q3DAbstractAxis::AxisOrientationY) + else if (orientation == QAbstract3DAxis::AxisOrientationY) m_changeTracker.axisYTypeChanged = true; - else if (orientation == Q3DAbstractAxis::AxisOrientationZ) + else if (orientation == QAbstract3DAxis::AxisOrientationZ) m_changeTracker.axisZTypeChanged = true; handleAxisTitleChangedBySender(axis); @@ -930,13 +930,13 @@ void Abstract3DController::setAxisHelper(Q3DAbstractAxis::AxisOrientation orient handleAxisAutoAdjustRangeChangedInOrientation(axis->orientation(), axis->isAutoAdjustRange()); - if (axis->type() & Q3DAbstractAxis::AxisTypeValue) { - Q3DValueAxis *valueAxis = static_cast(axis); - QObject::connect(valueAxis, &Q3DValueAxis::segmentCountChanged, + if (axis->type() & QAbstract3DAxis::AxisTypeValue) { + QValue3DAxis *valueAxis = static_cast(axis); + QObject::connect(valueAxis, &QValue3DAxis::segmentCountChanged, this, &Abstract3DController::handleAxisSegmentCountChanged); - QObject::connect(valueAxis, &Q3DValueAxis::subSegmentCountChanged, + QObject::connect(valueAxis, &QValue3DAxis::subSegmentCountChanged, this, &Abstract3DController::handleAxisSubSegmentCountChanged); - QObject::connect(valueAxis, &Q3DValueAxis::labelFormatChanged, + QObject::connect(valueAxis, &QValue3DAxis::labelFormatChanged, this, &Abstract3DController::handleAxisLabelFormatChanged); handleAxisSegmentCountChangedBySender(valueAxis); @@ -945,29 +945,29 @@ void Abstract3DController::setAxisHelper(Q3DAbstractAxis::AxisOrientation orient } } -Q3DAbstractAxis *Abstract3DController::createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation) +QAbstract3DAxis *Abstract3DController::createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation) { Q_UNUSED(orientation) // The default default axis is a value axis. If the graph type has a different default axis // for some orientation, this function needs to be overridden. - Q3DAbstractAxis *defaultAxis = createDefaultValueAxis(); + QAbstract3DAxis *defaultAxis = createDefaultValueAxis(); return defaultAxis; } -Q3DValueAxis *Abstract3DController::createDefaultValueAxis() +QValue3DAxis *Abstract3DController::createDefaultValueAxis() { // Default value axis has single segment, empty label format, and auto scaling - Q3DValueAxis *defaultAxis = new Q3DValueAxis; + QValue3DAxis *defaultAxis = new QValue3DAxis; defaultAxis->d_ptr->setDefaultAxis(true); return defaultAxis; } -Q3DCategoryAxis *Abstract3DController::createDefaultCategoryAxis() +QCategory3DAxis *Abstract3DController::createDefaultCategoryAxis() { // Default category axis has no labels - Q3DCategoryAxis *defaultAxis = new Q3DCategoryAxis; + QCategory3DAxis *defaultAxis = new QCategory3DAxis; defaultAxis->d_ptr->setDefaultAxis(true); return defaultAxis; } diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index b9c99210..91083eb9 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -30,7 +30,7 @@ #define ABSTRACT3DCONTROLLER_P_H #include "datavisualizationglobal_p.h" -#include "q3dabstractaxis.h" +#include "qabstract3daxis.h" #include "drawer_p.h" #include "qabstract3dinputhandler.h" #include "qabstractdataproxy.h" @@ -145,11 +145,11 @@ protected: QAbstract3DInputHandler *m_activeInputHandler; CameraHelper *m_cameraHelper; // Active axes - Q3DAbstractAxis *m_axisX; - Q3DAbstractAxis *m_axisY; - Q3DAbstractAxis *m_axisZ; + QAbstract3DAxis *m_axisX; + QAbstract3DAxis *m_axisY; + QAbstract3DAxis *m_axisZ; - QList m_axes; // List of all added axes + QList m_axes; // List of all added axes Abstract3DRenderer *m_renderer; bool m_isDataDirty; bool m_isSeriesVisibilityDirty; @@ -173,15 +173,15 @@ public: virtual void removeSeries(QAbstract3DSeries *series); QList seriesList(); - virtual void setAxisX(Q3DAbstractAxis *axis); - virtual Q3DAbstractAxis *axisX(); - virtual void setAxisY(Q3DAbstractAxis *axis); - virtual Q3DAbstractAxis *axisY(); - virtual void setAxisZ(Q3DAbstractAxis *axis); - virtual Q3DAbstractAxis *axisZ(); - virtual void addAxis(Q3DAbstractAxis *axis); - virtual void releaseAxis(Q3DAbstractAxis *axis); - virtual QList axes() const; // Omits default axes + virtual void setAxisX(QAbstract3DAxis *axis); + virtual QAbstract3DAxis *axisX(); + virtual void setAxisY(QAbstract3DAxis *axis); + virtual QAbstract3DAxis *axisY(); + virtual void setAxisZ(QAbstract3DAxis *axis); + virtual QAbstract3DAxis *axisZ(); + virtual void addAxis(QAbstract3DAxis *axis); + virtual void releaseAxis(QAbstract3DAxis *axis); + virtual QList axes() const; // Omits default axes virtual void addInputHandler(QAbstract3DInputHandler *inputHandler); virtual void releaseInputHandler(QAbstract3DInputHandler *inputHandler); @@ -226,7 +226,7 @@ public: virtual void handleAxisSegmentCountChangedBySender(QObject *sender); virtual void handleAxisSubSegmentCountChangedBySender(QObject *sender); virtual void handleAxisAutoAdjustRangeChangedInOrientation( - Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust) = 0; + QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) = 0; virtual void handleAxisLabelFormatChangedBySender(QObject *sender); virtual void handleSeriesVisibilityChangedBySender(QObject *sender); @@ -262,13 +262,13 @@ signals: void needRender(); protected: - virtual Q3DAbstractAxis *createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation); - Q3DValueAxis *createDefaultValueAxis(); - Q3DCategoryAxis *createDefaultCategoryAxis(); + virtual QAbstract3DAxis *createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation); + QValue3DAxis *createDefaultValueAxis(); + QCategory3DAxis *createDefaultCategoryAxis(); private: - void setAxisHelper(Q3DAbstractAxis::AxisOrientation orientation, Q3DAbstractAxis *axis, - Q3DAbstractAxis **axisPtr); + void setAxisHelper(QAbstract3DAxis::AxisOrientation orientation, QAbstract3DAxis *axis, + QAbstract3DAxis **axisPtr); friend class Bars3DController; }; diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 74088b7c..32435946 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "abstract3drenderer_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "texturehelper_p.h" #include "utils_p.h" #include "q3dscene_p.h" @@ -85,9 +85,9 @@ void Abstract3DRenderer::initializeOpenGL() m_textureHelper = new TextureHelper(); m_drawer->initializeOpenGL(); - axisCacheForOrientation(Q3DAbstractAxis::AxisOrientationX).setDrawer(m_drawer); - axisCacheForOrientation(Q3DAbstractAxis::AxisOrientationY).setDrawer(m_drawer); - axisCacheForOrientation(Q3DAbstractAxis::AxisOrientationZ).setDrawer(m_drawer); + axisCacheForOrientation(QAbstract3DAxis::AxisOrientationX).setDrawer(m_drawer); + axisCacheForOrientation(QAbstract3DAxis::AxisOrientationY).setDrawer(m_drawer); + axisCacheForOrientation(QAbstract3DAxis::AxisOrientationZ).setDrawer(m_drawer); } void Abstract3DRenderer::render(const GLuint defaultFboHandle) @@ -280,39 +280,39 @@ void Abstract3DRenderer::handleResize() #endif } -void Abstract3DRenderer::updateAxisType(Q3DAbstractAxis::AxisOrientation orientation, Q3DAbstractAxis::AxisType type) +void Abstract3DRenderer::updateAxisType(QAbstract3DAxis::AxisOrientation orientation, QAbstract3DAxis::AxisType type) { axisCacheForOrientation(orientation).setType(type); } -void Abstract3DRenderer::updateAxisTitle(Q3DAbstractAxis::AxisOrientation orientation, const QString &title) +void Abstract3DRenderer::updateAxisTitle(QAbstract3DAxis::AxisOrientation orientation, const QString &title) { axisCacheForOrientation(orientation).setTitle(title); } -void Abstract3DRenderer::updateAxisLabels(Q3DAbstractAxis::AxisOrientation orientation, const QStringList &labels) +void Abstract3DRenderer::updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation, const QStringList &labels) { axisCacheForOrientation(orientation).setLabels(labels); } -void Abstract3DRenderer::updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, float min, float max) +void Abstract3DRenderer::updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max) { AxisRenderCache &cache = axisCacheForOrientation(orientation); cache.setMin(min); cache.setMax(max); } -void Abstract3DRenderer::updateAxisSegmentCount(Q3DAbstractAxis::AxisOrientation orientation, int count) +void Abstract3DRenderer::updateAxisSegmentCount(QAbstract3DAxis::AxisOrientation orientation, int count) { axisCacheForOrientation(orientation).setSegmentCount(count); } -void Abstract3DRenderer::updateAxisSubSegmentCount(Q3DAbstractAxis::AxisOrientation orientation, int count) +void Abstract3DRenderer::updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientation orientation, int count) { axisCacheForOrientation(orientation).setSubSegmentCount(count); } -void Abstract3DRenderer::updateAxisLabelFormat(Q3DAbstractAxis::AxisOrientation orientation, const QString &format) +void Abstract3DRenderer::updateAxisLabelFormat(QAbstract3DAxis::AxisOrientation orientation, const QString &format) { axisCacheForOrientation(orientation).setLabelFormat(format); } @@ -353,14 +353,14 @@ void Abstract3DRenderer::updateSeries(const QList &seriesLi } } -AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(Q3DAbstractAxis::AxisOrientation orientation) +AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(QAbstract3DAxis::AxisOrientation orientation) { switch (orientation) { - case Q3DAbstractAxis::AxisOrientationX: + case QAbstract3DAxis::AxisOrientationX: return m_axisCacheX; - case Q3DAbstractAxis::AxisOrientationY: + case QAbstract3DAxis::AxisOrientationY: return m_axisCacheY; - case Q3DAbstractAxis::AxisOrientationZ: + case QAbstract3DAxis::AxisOrientationZ: return m_axisCacheZ; default: qFatal("Abstract3DRenderer::axisCacheForOrientation"); diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 17a55ac9..068ee0ef 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -84,13 +84,13 @@ public: virtual void initShaders(const QString &vertexShader, const QString &fragmentShader) = 0; virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader); virtual void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) = 0; - virtual void updateAxisType(Q3DAbstractAxis::AxisOrientation orientation, Q3DAbstractAxis::AxisType type); - virtual void updateAxisTitle(Q3DAbstractAxis::AxisOrientation orientation, const QString &title); - virtual void updateAxisLabels(Q3DAbstractAxis::AxisOrientation orientation, const QStringList &labels); - virtual void updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, float min, float max); - virtual void updateAxisSegmentCount(Q3DAbstractAxis::AxisOrientation orientation, int count); - virtual void updateAxisSubSegmentCount(Q3DAbstractAxis::AxisOrientation orientation, int count); - virtual void updateAxisLabelFormat(Q3DAbstractAxis::AxisOrientation orientation, const QString &format); + virtual void updateAxisType(QAbstract3DAxis::AxisOrientation orientation, QAbstract3DAxis::AxisType type); + virtual void updateAxisTitle(QAbstract3DAxis::AxisOrientation orientation, const QString &title); + virtual void updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation, const QStringList &labels); + virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max); + virtual void updateAxisSegmentCount(QAbstract3DAxis::AxisOrientation orientation, int count); + virtual void updateAxisSubSegmentCount(QAbstract3DAxis::AxisOrientation orientation, int count); + virtual void updateAxisLabelFormat(QAbstract3DAxis::AxisOrientation orientation, const QString &format); virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh); void fixGradientAndGenerateTexture(QLinearGradient *gradient, GLuint *gradientTexture); @@ -108,7 +108,7 @@ protected: virtual void handleShadowQualityChange(); virtual void handleResize(); - AxisRenderCache &axisCacheForOrientation(Q3DAbstractAxis::AxisOrientation orientation); + AxisRenderCache &axisCacheForOrientation(QAbstract3DAxis::AxisOrientation orientation); virtual void lowerShadowQuality(); diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index f7960b2b..5ada62ca 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -23,7 +23,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE AxisRenderCache::AxisRenderCache() - : m_type(Q3DAbstractAxis::AxisTypeNone), + : m_type(QAbstract3DAxis::AxisTypeNone), m_min(0.0f), m_max(10.0f), m_segmentCount(5), @@ -51,7 +51,7 @@ void AxisRenderCache::setDrawer(Drawer *drawer) } } -void AxisRenderCache::setType(Q3DAbstractAxis::AxisType type) +void AxisRenderCache::setType(QAbstract3DAxis::AxisType type) { m_type = type; diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h index cddc7839..991cff76 100644 --- a/src/datavisualization/engine/axisrendercache_p.h +++ b/src/datavisualization/engine/axisrendercache_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" #include "labelitem_p.h" -#include "q3dabstractaxis_p.h" +#include "qabstract3daxis_p.h" #include "drawer_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -45,8 +45,8 @@ public: void setDrawer(Drawer *drawer); - void setType(Q3DAbstractAxis::AxisType type); - inline Q3DAbstractAxis::AxisType type() const { return m_type; } + void setType(QAbstract3DAxis::AxisType type); + inline QAbstract3DAxis::AxisType type() const { return m_type; } void setTitle(const QString &title); inline const QString &title() { return m_title; } void setLabels(const QStringList &labels); @@ -76,7 +76,7 @@ private: int maxLabelWidth(const QStringList &labels) const; // Cached axis values - Q3DAbstractAxis::AxisType m_type; + QAbstract3DAxis::AxisType m_type; QString m_title; QStringList m_labels; float m_min; diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index 007fdffc..3efd890b 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -19,9 +19,9 @@ #include "bars3dcontroller_p.h" #include "bars3drenderer_p.h" #include "camerahelper_p.h" -#include "q3dabstractaxis_p.h" -#include "q3dvalueaxis_p.h" -#include "q3dcategoryaxis_p.h" +#include "qabstract3daxis_p.h" +#include "qvalue3daxis_p.h" +#include "qcategory3daxis_p.h" #include "qbardataproxy_p.h" #include "qbar3dseries_p.h" #include "thememanager_p.h" @@ -164,7 +164,7 @@ void Bars3DController::handleDataRowLabelsChanged() int min = int(m_axisZ->min()); int count = int(m_axisZ->max()) - min + 1; QStringList subList = firstSeries->dataProxy()->rowLabels().mid(min, count); - static_cast(m_axisZ)->dptr()->setDataLabels(subList); + static_cast(m_axisZ)->dptr()->setDataLabels(subList); } } @@ -179,7 +179,7 @@ void Bars3DController::handleDataColumnLabelsChanged() int count = int(m_axisX->max()) - min + 1; QStringList subList = static_cast(firstSeries->dataProxy()) ->columnLabels().mid(min, count); - static_cast(m_axisX)->dptr()->setDataLabels(subList); + static_cast(m_axisX)->dptr()->setDataLabels(subList); } } @@ -192,7 +192,7 @@ void Bars3DController::handleBarClicked(const QPoint &position, QBar3DSeries *se } void Bars3DController::handleAxisAutoAdjustRangeChangedInOrientation( - Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust) + QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) { Q_UNUSED(orientation) Q_UNUSED(autoAdjust) @@ -214,13 +214,13 @@ QPoint Bars3DController::invalidSelectionPosition() return invalidSelectionPos; } -void Bars3DController::setAxisX(Q3DAbstractAxis *axis) +void Bars3DController::setAxisX(QAbstract3DAxis *axis) { Abstract3DController::setAxisX(axis); handleDataColumnLabelsChanged(); } -void Bars3DController::setAxisZ(Q3DAbstractAxis *axis) +void Bars3DController::setAxisZ(QAbstract3DAxis *axis) { Abstract3DController::setAxisZ(axis); handleDataRowLabelsChanged(); @@ -385,9 +385,9 @@ void Bars3DController::setSelectedBar(const QPoint &position, QBar3DSeries *seri void Bars3DController::adjustAxisRanges() { - Q3DCategoryAxis *categoryAxisZ = static_cast(m_axisZ); - Q3DCategoryAxis *categoryAxisX = static_cast(m_axisX); - Q3DValueAxis *valueAxis = static_cast(m_axisY); + QCategory3DAxis *categoryAxisZ = static_cast(m_axisZ); + QCategory3DAxis *categoryAxisX = static_cast(m_axisX); + QValue3DAxis *valueAxis = static_cast(m_axisY); bool adjustZ = (categoryAxisZ && categoryAxisZ->isAutoAdjustRange()); bool adjustX = (categoryAxisX && categoryAxisX->isAutoAdjustRange()); @@ -493,11 +493,11 @@ void Bars3DController::adjustSelectionPosition(QPoint &pos, const QBar3DSeries * } } -Q3DAbstractAxis *Bars3DController::createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation) +QAbstract3DAxis *Bars3DController::createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation) { - Q3DAbstractAxis *defaultAxis = 0; + QAbstract3DAxis *defaultAxis = 0; - if (orientation == Q3DAbstractAxis::AxisOrientationY) + if (orientation == QAbstract3DAxis::AxisOrientationY) defaultAxis = createDefaultValueAxis(); else defaultAxis = createDefaultCategoryAxis(); diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index 54385571..46fc991d 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -92,13 +92,13 @@ public: void setSelectionMode(QDataVis::SelectionFlags mode); void setSelectedBar(const QPoint &position, QBar3DSeries *series); - virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust); + virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust); virtual void handleSeriesVisibilityChangedBySender(QObject *sender); static QPoint invalidSelectionPosition(); - virtual void setAxisX(Q3DAbstractAxis *axis); - virtual void setAxisZ(Q3DAbstractAxis *axis); + virtual void setAxisX(QAbstract3DAxis *axis); + virtual void setAxisZ(QAbstract3DAxis *axis); virtual void addSeries(QAbstract3DSeries *series); virtual void removeSeries(QAbstract3DSeries *series); @@ -120,7 +120,7 @@ public slots: void handleBarClicked(const QPoint &position, QBar3DSeries *series); protected: - virtual Q3DAbstractAxis *createDefaultAxis(Q3DAbstractAxis::AxisOrientation orientation); + virtual QAbstract3DAxis *createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation); private: void adjustAxisRanges(); diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index f13b6e79..ba9f842c 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -1848,12 +1848,12 @@ void Bars3DRenderer::updateBarSpecs(GLfloat thicknessRatio, const QSizeF &spacin calculateSceneScalingFactors(); } -void Bars3DRenderer::updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, float min, +void Bars3DRenderer::updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max) { Abstract3DRenderer::updateAxisRange(orientation, min, max); - if (orientation == Q3DAbstractAxis::AxisOrientationY) { + if (orientation == QAbstract3DAxis::AxisOrientationY) { calculateHeightAdjustment(); // Check if we have negative values if (min < 0 && !m_hasNegativeValues) { diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index 16e7a476..2cdb28e4 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -125,7 +125,7 @@ public slots: void updateSelectedBar(const QPoint &position, const QBar3DSeries *series); // Overloaded from abstract renderer - virtual void updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, float min, float max); + virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max); signals: void barClicked(QPoint position, QBar3DSeries *series); diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 0d711359..d9e265a1 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -19,8 +19,8 @@ #include "q3dbars.h" #include "q3dbars_p.h" #include "bars3dcontroller_p.h" -#include "q3dvalueaxis.h" -#include "q3dcategoryaxis.h" +#include "qvalue3daxis.h" +#include "qcategory3daxis.h" #include "q3dcamera.h" #include "qbar3dseries_p.h" @@ -208,7 +208,7 @@ bool Q3DBars::isBarSpacingRelative() * * \sa addAxis(), releaseAxis() */ -void Q3DBars::setRowAxis(Q3DCategoryAxis *axis) +void Q3DBars::setRowAxis(QCategory3DAxis *axis) { dptr()->m_shared->setAxisZ(axis); } @@ -216,9 +216,9 @@ void Q3DBars::setRowAxis(Q3DCategoryAxis *axis) /*! * \return category axis for rows. */ -Q3DCategoryAxis *Q3DBars::rowAxis() const +QCategory3DAxis *Q3DBars::rowAxis() const { - return static_cast(dptrc()->m_shared->axisZ()); + return static_cast(dptrc()->m_shared->axisZ()); } /*! @@ -230,7 +230,7 @@ Q3DCategoryAxis *Q3DBars::rowAxis() const * * \sa addAxis(), releaseAxis() */ -void Q3DBars::setColumnAxis(Q3DCategoryAxis *axis) +void Q3DBars::setColumnAxis(QCategory3DAxis *axis) { dptr()->m_shared->setAxisX(axis); } @@ -238,9 +238,9 @@ void Q3DBars::setColumnAxis(Q3DCategoryAxis *axis) /*! * \return category axis for columns. */ -Q3DCategoryAxis *Q3DBars::columnAxis() const +QCategory3DAxis *Q3DBars::columnAxis() const { - return static_cast(dptrc()->m_shared->axisX()); + return static_cast(dptrc()->m_shared->axisX()); } /*! @@ -253,7 +253,7 @@ Q3DCategoryAxis *Q3DBars::columnAxis() const * * \sa addAxis(), releaseAxis() */ -void Q3DBars::setValueAxis(Q3DValueAxis *axis) +void Q3DBars::setValueAxis(QValue3DAxis *axis) { dptr()->m_shared->setAxisY(axis); } @@ -261,9 +261,9 @@ void Q3DBars::setValueAxis(Q3DValueAxis *axis) /*! * \return used value axis (Y-axis). */ -Q3DValueAxis *Q3DBars::valueAxis() const +QValue3DAxis *Q3DBars::valueAxis() const { - return static_cast(dptrc()->m_shared->axisY()); + return static_cast(dptrc()->m_shared->axisY()); } /*! @@ -273,7 +273,7 @@ Q3DValueAxis *Q3DBars::valueAxis() const * * \sa releaseAxis(), setValueAxis(), setRowAxis(), setColumnAxis() */ -void Q3DBars::addAxis(Q3DAbstractAxis *axis) +void Q3DBars::addAxis(QAbstract3DAxis *axis) { dptr()->m_shared->addAxis(axis); } @@ -286,7 +286,7 @@ void Q3DBars::addAxis(Q3DAbstractAxis *axis) * * \sa addAxis(), setValueAxis(), setRowAxis(), setColumnAxis() */ -void Q3DBars::releaseAxis(Q3DAbstractAxis *axis) +void Q3DBars::releaseAxis(QAbstract3DAxis *axis) { dptr()->m_shared->releaseAxis(axis); } @@ -296,7 +296,7 @@ void Q3DBars::releaseAxis(Q3DAbstractAxis *axis) * * \sa addAxis() */ -QList Q3DBars::axes() const +QList Q3DBars::axes() const { return dptrc()->m_shared->axes(); } diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index 7da446b4..80cd1ba4 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -27,9 +27,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class Q3DBarsPrivate; -class Q3DAbstractAxis; -class Q3DCategoryAxis; -class Q3DValueAxis; +class QAbstract3DAxis; +class QCategory3DAxis; +class QValue3DAxis; class QBar3DSeries; class QT_DATAVISUALIZATION_EXPORT Q3DBars : public QAbstract3DGraph @@ -56,15 +56,15 @@ public: void setBarSpacingRelative(bool relative); bool isBarSpacingRelative(); - void setRowAxis(Q3DCategoryAxis *axis); - Q3DCategoryAxis *rowAxis() const; - void setColumnAxis(Q3DCategoryAxis *axis); - Q3DCategoryAxis *columnAxis() const; - void setValueAxis(Q3DValueAxis *axis); - Q3DValueAxis *valueAxis() const; - void addAxis(Q3DAbstractAxis *axis); - void releaseAxis(Q3DAbstractAxis *axis); - QList axes() const; + void setRowAxis(QCategory3DAxis *axis); + QCategory3DAxis *rowAxis() const; + void setColumnAxis(QCategory3DAxis *axis); + QCategory3DAxis *columnAxis() const; + void setValueAxis(QValue3DAxis *axis); + QValue3DAxis *valueAxis() const; + void addAxis(QAbstract3DAxis *axis); + void releaseAxis(QAbstract3DAxis *axis); + QList axes() const; signals: void barThicknessChanged(float thicknessRatio); diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index aef1e89e..c71ce795 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -19,7 +19,7 @@ #include "q3dscatter.h" #include "q3dscatter_p.h" #include "scatter3dcontroller_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "q3dcamera.h" #include "qscatter3dseries_p.h" @@ -141,7 +141,7 @@ const Q3DScatterPrivate *Q3DScatter::dptrc() const * * \sa addAxis(), releaseAxis() */ -void Q3DScatter::setAxisX(Q3DValueAxis *axis) +void Q3DScatter::setAxisX(QValue3DAxis *axis) { dptr()->m_shared->setAxisX(axis); } @@ -149,9 +149,9 @@ void Q3DScatter::setAxisX(Q3DValueAxis *axis) /*! * \return used X-axis. */ -Q3DValueAxis *Q3DScatter::axisX() const +QValue3DAxis *Q3DScatter::axisX() const { - return static_cast(dptrc()->m_shared->axisX()); + return static_cast(dptrc()->m_shared->axisX()); } /*! @@ -164,7 +164,7 @@ Q3DValueAxis *Q3DScatter::axisX() const * * \sa addAxis(), releaseAxis() */ -void Q3DScatter::setAxisY(Q3DValueAxis *axis) +void Q3DScatter::setAxisY(QValue3DAxis *axis) { dptr()->m_shared->setAxisY(axis); } @@ -172,9 +172,9 @@ void Q3DScatter::setAxisY(Q3DValueAxis *axis) /*! * \return used Y-axis. */ -Q3DValueAxis *Q3DScatter::axisY() const +QValue3DAxis *Q3DScatter::axisY() const { - return static_cast(dptrc()->m_shared->axisY()); + return static_cast(dptrc()->m_shared->axisY()); } /*! @@ -187,7 +187,7 @@ Q3DValueAxis *Q3DScatter::axisY() const * * \sa addAxis(), releaseAxis() */ -void Q3DScatter::setAxisZ(Q3DValueAxis *axis) +void Q3DScatter::setAxisZ(QValue3DAxis *axis) { dptr()->m_shared->setAxisZ(axis); } @@ -195,9 +195,9 @@ void Q3DScatter::setAxisZ(Q3DValueAxis *axis) /*! * \return used Z-axis. */ -Q3DValueAxis *Q3DScatter::axisZ() const +QValue3DAxis *Q3DScatter::axisZ() const { - return static_cast(dptrc()->m_shared->axisZ()); + return static_cast(dptrc()->m_shared->axisZ()); } /*! @@ -207,7 +207,7 @@ Q3DValueAxis *Q3DScatter::axisZ() const * * \sa releaseAxis(), setAxisX(), setAxisY(), setAxisZ() */ -void Q3DScatter::addAxis(Q3DValueAxis *axis) +void Q3DScatter::addAxis(QValue3DAxis *axis) { dptr()->m_shared->addAxis(axis); } @@ -220,7 +220,7 @@ void Q3DScatter::addAxis(Q3DValueAxis *axis) * * \sa addAxis(), setAxisX(), setAxisY(), setAxisZ() */ -void Q3DScatter::releaseAxis(Q3DValueAxis *axis) +void Q3DScatter::releaseAxis(QValue3DAxis *axis) { dptr()->m_shared->releaseAxis(axis); } @@ -230,12 +230,12 @@ void Q3DScatter::releaseAxis(Q3DValueAxis *axis) * * \sa addAxis() */ -QList Q3DScatter::axes() const +QList Q3DScatter::axes() const { - QList abstractAxes = dptrc()->m_shared->axes(); - QList retList; - foreach (Q3DAbstractAxis *axis, abstractAxes) - retList.append(static_cast(axis)); + QList abstractAxes = dptrc()->m_shared->axes(); + QList retList; + foreach (QAbstract3DAxis *axis, abstractAxes) + retList.append(static_cast(axis)); return retList; } diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index f6f3dd2f..8a94864e 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -28,8 +28,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class Q3DScatterPrivate; -class Q3DValueAxis; -class Q3DCategoryAxis; +class QValue3DAxis; +class QCategory3DAxis; class QScatter3DSeries; class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public QAbstract3DGraph @@ -43,15 +43,15 @@ public: void removeSeries(QScatter3DSeries *series); QList seriesList(); - void setAxisX(Q3DValueAxis *axis); - Q3DValueAxis *axisX() const; - void setAxisY(Q3DValueAxis *axis); - Q3DValueAxis *axisY() const; - void setAxisZ(Q3DValueAxis *axis); - Q3DValueAxis *axisZ() const; - void addAxis(Q3DValueAxis *axis); - void releaseAxis(Q3DValueAxis *axis); - QList axes() const; + void setAxisX(QValue3DAxis *axis); + QValue3DAxis *axisX() const; + void setAxisY(QValue3DAxis *axis); + QValue3DAxis *axisY() const; + void setAxisZ(QValue3DAxis *axis); + QValue3DAxis *axisZ() const; + void addAxis(QValue3DAxis *axis); + void releaseAxis(QValue3DAxis *axis); + QList axes() const; private: Q3DScatterPrivate *dptr(); diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 0df5a9bb..0b09aba4 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -18,7 +18,7 @@ #include "q3dsurface.h" #include "q3dsurface_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "qsurfacedataproxy.h" #include "q3dcamera.h" #include "qsurface3dseries_p.h" @@ -40,7 +40,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * The selection pointer is accompanied with a label which in default case shows the value of the * data point and the coordinates of the point. * - * The value range and the label format shown on the axis can be controlled through Q3DValueAxis. + * The value range and the label format shown on the axis can be controlled through QValue3DAxis. * * To rotate the graph, hold down the right mouse button and move the mouse. Zooming is done using mouse * wheel. Both assume the default input handler is in use. @@ -156,7 +156,7 @@ const Q3DSurfacePrivate *Q3DSurface::dptrc() const * * \sa addAxis(), releaseAxis() */ -void Q3DSurface::setAxisX(Q3DValueAxis *axis) +void Q3DSurface::setAxisX(QValue3DAxis *axis) { dptr()->m_shared->setAxisX(axis); } @@ -164,9 +164,9 @@ void Q3DSurface::setAxisX(Q3DValueAxis *axis) /*! * \return used X-axis. */ -Q3DValueAxis *Q3DSurface::axisX() const +QValue3DAxis *Q3DSurface::axisX() const { - return static_cast(dptrc()->m_shared->axisX()); + return static_cast(dptrc()->m_shared->axisX()); } /*! @@ -179,7 +179,7 @@ Q3DValueAxis *Q3DSurface::axisX() const * * \sa addAxis(), releaseAxis() */ -void Q3DSurface::setAxisY(Q3DValueAxis *axis) +void Q3DSurface::setAxisY(QValue3DAxis *axis) { dptr()->m_shared->setAxisY(axis); } @@ -187,9 +187,9 @@ void Q3DSurface::setAxisY(Q3DValueAxis *axis) /*! * \return used Y-axis. */ -Q3DValueAxis *Q3DSurface::axisY() const +QValue3DAxis *Q3DSurface::axisY() const { - return static_cast(dptrc()->m_shared->axisY()); + return static_cast(dptrc()->m_shared->axisY()); } /*! @@ -202,7 +202,7 @@ Q3DValueAxis *Q3DSurface::axisY() const * * \sa addAxis(), releaseAxis() */ -void Q3DSurface::setAxisZ(Q3DValueAxis *axis) +void Q3DSurface::setAxisZ(QValue3DAxis *axis) { dptr()->m_shared->setAxisZ(axis); } @@ -210,9 +210,9 @@ void Q3DSurface::setAxisZ(Q3DValueAxis *axis) /*! * \return used Z-axis. */ -Q3DValueAxis *Q3DSurface::axisZ() const +QValue3DAxis *Q3DSurface::axisZ() const { - return static_cast(dptrc()->m_shared->axisZ()); + return static_cast(dptrc()->m_shared->axisZ()); } /*! @@ -222,7 +222,7 @@ Q3DValueAxis *Q3DSurface::axisZ() const * * \sa releaseAxis(), setAxisX(), setAxisY(), setAxisZ() */ -void Q3DSurface::addAxis(Q3DValueAxis *axis) +void Q3DSurface::addAxis(QValue3DAxis *axis) { dptr()->m_shared->addAxis(axis); } @@ -235,7 +235,7 @@ void Q3DSurface::addAxis(Q3DValueAxis *axis) * * \sa addAxis(), setAxisX(), setAxisY(), setAxisZ() */ -void Q3DSurface::releaseAxis(Q3DValueAxis *axis) +void Q3DSurface::releaseAxis(QValue3DAxis *axis) { dptr()->m_shared->releaseAxis(axis); } @@ -245,12 +245,12 @@ void Q3DSurface::releaseAxis(Q3DValueAxis *axis) * * \sa addAxis() */ -QList Q3DSurface::axes() const +QList Q3DSurface::axes() const { - QList abstractAxes = dptrc()->m_shared->axes(); - QList retList; - foreach (Q3DAbstractAxis *axis, abstractAxes) - retList.append(static_cast(axis)); + QList abstractAxes = dptrc()->m_shared->axes(); + QList retList; + foreach (QAbstract3DAxis *axis, abstractAxes) + retList.append(static_cast(axis)); return retList; } diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 822e9d7c..4d6bcf5e 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -27,7 +27,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class Q3DSurfacePrivate; -class Q3DValueAxis; +class QValue3DAxis; class QSurface3DSeries; class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public QAbstract3DGraph @@ -42,15 +42,15 @@ public: QList seriesList(); // Axes - void setAxisX(Q3DValueAxis *axis); - Q3DValueAxis *axisX() const; - void setAxisY(Q3DValueAxis *axis); - Q3DValueAxis *axisY() const; - void setAxisZ(Q3DValueAxis *axis); - Q3DValueAxis *axisZ() const; - void addAxis(Q3DValueAxis *axis); - void releaseAxis(Q3DValueAxis *axis); - QList axes() const; + void setAxisX(QValue3DAxis *axis); + QValue3DAxis *axisX() const; + void setAxisY(QValue3DAxis *axis); + QValue3DAxis *axisY() const; + void setAxisZ(QValue3DAxis *axis); + QValue3DAxis *axisZ() const; + void addAxis(QValue3DAxis *axis); + void releaseAxis(QValue3DAxis *axis); + QList axes() const; private: Q3DSurfacePrivate *dptr(); diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index 0a506f19..61a95e88 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -19,8 +19,8 @@ #include "scatter3dcontroller_p.h" #include "scatter3drenderer_p.h" #include "camerahelper_p.h" -#include "q3dabstractaxis_p.h" -#include "q3dvalueaxis_p.h" +#include "qabstract3daxis_p.h" +#include "qvalue3daxis_p.h" #include "qscatterdataproxy_p.h" #include "qscatter3dseries_p.h" @@ -179,7 +179,7 @@ void Scatter3DController::handleItemClicked(int index, QScatter3DSeries *series) } void Scatter3DController::handleAxisAutoAdjustRangeChangedInOrientation( - Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust) + QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) { Q_UNUSED(orientation) Q_UNUSED(autoAdjust) @@ -239,9 +239,9 @@ void Scatter3DController::setSelectedItem(int index, QScatter3DSeries *series) void Scatter3DController::adjustValueAxisRange() { - Q3DValueAxis *valueAxisX = static_cast(m_axisX); - Q3DValueAxis *valueAxisY = static_cast(m_axisY); - Q3DValueAxis *valueAxisZ = static_cast(m_axisZ); + QValue3DAxis *valueAxisX = static_cast(m_axisX); + QValue3DAxis *valueAxisY = static_cast(m_axisY); + QValue3DAxis *valueAxisZ = static_cast(m_axisZ); bool adjustX = (valueAxisX && valueAxisX->isAutoAdjustRange()); bool adjustY = (valueAxisY && valueAxisY->isAutoAdjustRange()); bool adjustZ = (valueAxisZ && valueAxisZ->isAutoAdjustRange()); diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index 00c87d4f..397d47a4 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_p.h @@ -80,7 +80,7 @@ public: virtual void removeSeries(QAbstract3DSeries *series); virtual QList scatterSeriesList(); - virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust); + virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust); virtual void handleAxisRangeChangedBySender(QObject *sender); public slots: diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index ee5c119e..b70fd5b4 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -1621,7 +1621,7 @@ void Scatter3DRenderer::fixMeshFileName(QString &fileName, QAbstract3DSeries::Me } } -void Scatter3DRenderer::updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, +void Scatter3DRenderer::updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max) { Abstract3DRenderer::updateAxisRange(orientation, min, max); diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 30ec7489..9153d80a 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -137,7 +137,7 @@ private: public slots: // Overloaded from abstract renderer - virtual void updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, float min, float max); + virtual void updateAxisRange(QAbstract3DAxis::AxisOrientation orientation, float min, float max); void updateSelectedItem(int index, const QScatter3DSeries *series); diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 3cec72d1..6082e105 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -19,9 +19,9 @@ #include "surface3dcontroller_p.h" #include "surface3drenderer_p.h" #include "camerahelper_p.h" -#include "q3dabstractaxis_p.h" -#include "q3dvalueaxis_p.h" -#include "q3dcategoryaxis.h" +#include "qabstract3daxis_p.h" +#include "qvalue3daxis_p.h" +#include "qcategory3daxis.h" #include "qsurfacedataproxy_p.h" #include "qsurface3dseries_p.h" #include "shaderhelper_p.h" @@ -91,7 +91,7 @@ void Surface3DController::synchDataToRenderer() } } -void Surface3DController::handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust) +void Surface3DController::handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust) { Q_UNUSED(orientation) Q_UNUSED(autoAdjust) @@ -383,9 +383,9 @@ void Surface3DController::handleRowsRemoved(int startIndex, int count) void Surface3DController::adjustValueAxisRange() { - Q3DValueAxis *valueAxisX = static_cast(m_axisX); - Q3DValueAxis *valueAxisY = static_cast(m_axisY); - Q3DValueAxis *valueAxisZ = static_cast(m_axisZ); + QValue3DAxis *valueAxisX = static_cast(m_axisX); + QValue3DAxis *valueAxisY = static_cast(m_axisY); + QValue3DAxis *valueAxisZ = static_cast(m_axisZ); bool adjustX = (valueAxisX && valueAxisX->isAutoAdjustRange()); bool adjustY = (valueAxisY && valueAxisY->isAutoAdjustRange()); bool adjustZ = (valueAxisZ && valueAxisZ->isAutoAdjustRange()); diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 714420a4..54d709b4 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -79,7 +79,7 @@ public: void setSelectionMode(QDataVis::SelectionFlags mode); void setSelectedPoint(const QPoint &position, QSurface3DSeries *series); - virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust); + virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust); virtual void handleAxisRangeChangedBySender(QObject *sender); virtual void handleSeriesVisibilityChangedBySender(QObject *sender); diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index b9f26938..5cac1882 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "abstractdeclarative_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include #include #include diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 8dcdfbcc..c49f4894 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -29,7 +29,7 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri) QLatin1String("Trying to create uncreatable: AbstractItemModel.")); qmlRegisterUncreatableType(uri, 1, 0, "DataVis", QLatin1String("Trying to create uncreatable: DataVis.")); - qmlRegisterUncreatableType(uri, 1, 0, "AbstractAxis3D", + qmlRegisterUncreatableType(uri, 1, 0, "AbstractAxis3D", QLatin1String("Trying to create uncreatable: AbstractAxis.")); qmlRegisterUncreatableType(uri, 1, 0, "AbstractDataProxy", QLatin1String("Trying to create uncreatable: AbstractDataProxy.")); @@ -60,8 +60,8 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "Scatter3D"); qmlRegisterType(uri, 1, 0, "Surface3D"); - qmlRegisterType(uri, 1, 0, "ValueAxis3D"); - qmlRegisterType(uri, 1, 0, "CategoryAxis3D"); + qmlRegisterType(uri, 1, 0, "ValueAxis3D"); + qmlRegisterType(uri, 1, 0, "CategoryAxis3D"); qmlRegisterType(uri, 1, 0, "Camera3D"); qmlRegisterType(uri, 1, 0, "Light3D"); diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index 25c06364..3e689aec 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -27,8 +27,8 @@ #include "qitemmodelscatterdataproxy.h" #include "qitemmodelsurfacedataproxy.h" #include "qheightmapsurfacedataproxy.h" -#include "q3dvalueaxis.h" -#include "q3dcategoryaxis.h" +#include "qvalue3daxis.h" +#include "qcategory3daxis.h" #include "q3dobject.h" #include "q3dcamera.h" #include "q3dscene.h" @@ -55,9 +55,9 @@ QML_DECLARE_TYPE(DeclarativeSurface) QML_DECLARE_TYPE(const QAbstractItemModel) QML_DECLARE_TYPE(QDataVis) -QML_DECLARE_TYPE(Q3DAbstractAxis) -QML_DECLARE_TYPE(Q3DCategoryAxis) -QML_DECLARE_TYPE(Q3DValueAxis) +QML_DECLARE_TYPE(QAbstract3DAxis) +QML_DECLARE_TYPE(QCategory3DAxis) +QML_DECLARE_TYPE(QValue3DAxis) QML_DECLARE_TYPE(Q3DScene) QML_DECLARE_TYPE(Q3DObject) diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 7eab8886..a9e4503c 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "declarativebars_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "qitemmodelbardataproxy.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -50,32 +50,32 @@ DeclarativeBars::~DeclarativeBars() delete m_barsController; } -Q3DCategoryAxis *DeclarativeBars::rowAxis() const +QCategory3DAxis *DeclarativeBars::rowAxis() const { - return static_cast(m_barsController->axisZ()); + return static_cast(m_barsController->axisZ()); } -void DeclarativeBars::setRowAxis(Q3DCategoryAxis *axis) +void DeclarativeBars::setRowAxis(QCategory3DAxis *axis) { m_barsController->setAxisZ(axis); } -Q3DValueAxis *DeclarativeBars::valueAxis() const +QValue3DAxis *DeclarativeBars::valueAxis() const { - return static_cast(m_barsController->axisY()); + return static_cast(m_barsController->axisY()); } -void DeclarativeBars::setValueAxis(Q3DValueAxis *axis) +void DeclarativeBars::setValueAxis(QValue3DAxis *axis) { m_barsController->setAxisY(axis); } -Q3DCategoryAxis *DeclarativeBars::columnAxis() const +QCategory3DAxis *DeclarativeBars::columnAxis() const { - return static_cast(m_barsController->axisX()); + return static_cast(m_barsController->axisX()); } -void DeclarativeBars::setColumnAxis(Q3DCategoryAxis *axis) +void DeclarativeBars::setColumnAxis(QCategory3DAxis *axis) { m_barsController->setAxisX(axis); } diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 29d9dc91..3d748bce 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -33,8 +33,8 @@ #include "abstractdeclarative_p.h" #include "bars3dcontroller_p.h" #include "declarativebars_p.h" -#include "q3dvalueaxis.h" -#include "q3dcategoryaxis.h" +#include "qvalue3daxis.h" +#include "qcategory3daxis.h" #include "qbardataproxy.h" #include "qbar3dseries.h" @@ -48,9 +48,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class DeclarativeBars : public AbstractDeclarative { Q_OBJECT - Q_PROPERTY(Q3DCategoryAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged) - Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis NOTIFY valueAxisChanged) - Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis NOTIFY columnAxisChanged) + Q_PROPERTY(QCategory3DAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged) + Q_PROPERTY(QValue3DAxis *valueAxis READ valueAxis WRITE setValueAxis NOTIFY valueAxisChanged) + Q_PROPERTY(QCategory3DAxis *columnAxis READ columnAxis WRITE setColumnAxis NOTIFY columnAxisChanged) Q_PROPERTY(float barThickness READ barThickness WRITE setBarThickness NOTIFY barThicknessChanged) Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing NOTIFY barSpacingChanged) Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative NOTIFY barSpacingRelativeChanged) @@ -61,12 +61,12 @@ public: explicit DeclarativeBars(QQuickItem *parent = 0); ~DeclarativeBars(); - Q3DCategoryAxis *rowAxis() const; - void setRowAxis(Q3DCategoryAxis *axis); - Q3DValueAxis *valueAxis() const; - void setValueAxis(Q3DValueAxis *axis); - Q3DCategoryAxis *columnAxis() const; - void setColumnAxis(Q3DCategoryAxis *axis); + QCategory3DAxis *rowAxis() const; + void setRowAxis(QCategory3DAxis *axis); + QValue3DAxis *valueAxis() const; + void setValueAxis(QValue3DAxis *axis); + QCategory3DAxis *columnAxis() const; + void setColumnAxis(QCategory3DAxis *axis); void setBarThickness(float thicknessRatio); float barThickness() const; @@ -86,9 +86,9 @@ public: Q_INVOKABLE void removeSeries(QBar3DSeries *series); signals: - void rowAxisChanged(Q3DCategoryAxis *axis); - void valueAxisChanged(Q3DValueAxis *axis); - void columnAxisChanged(Q3DCategoryAxis *axis); + void rowAxisChanged(QCategory3DAxis *axis); + void valueAxisChanged(QValue3DAxis *axis); + void columnAxisChanged(QCategory3DAxis *axis); void barThicknessChanged(float thicknessRatio); void barSpacingChanged(QSizeF spacing); void barSpacingRelativeChanged(bool relative); diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index 5aaa19b6..3f7979b6 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -49,32 +49,32 @@ DeclarativeScatter::~DeclarativeScatter() delete m_scatterController; } -Q3DValueAxis *DeclarativeScatter::axisX() const +QValue3DAxis *DeclarativeScatter::axisX() const { - return static_cast(m_scatterController->axisX()); + return static_cast(m_scatterController->axisX()); } -void DeclarativeScatter::setAxisX(Q3DValueAxis *axis) +void DeclarativeScatter::setAxisX(QValue3DAxis *axis) { m_scatterController->setAxisX(axis); } -Q3DValueAxis *DeclarativeScatter::axisY() const +QValue3DAxis *DeclarativeScatter::axisY() const { - return static_cast(m_scatterController->axisY()); + return static_cast(m_scatterController->axisY()); } -void DeclarativeScatter::setAxisY(Q3DValueAxis *axis) +void DeclarativeScatter::setAxisY(QValue3DAxis *axis) { m_scatterController->setAxisY(axis); } -Q3DValueAxis *DeclarativeScatter::axisZ() const +QValue3DAxis *DeclarativeScatter::axisZ() const { - return static_cast(m_scatterController->axisZ()); + return static_cast(m_scatterController->axisZ()); } -void DeclarativeScatter::setAxisZ(Q3DValueAxis *axis) +void DeclarativeScatter::setAxisZ(QValue3DAxis *axis) { m_scatterController->setAxisZ(axis); } diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index b9f5a3b7..4ccf7d05 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -33,7 +33,7 @@ #include "abstractdeclarative_p.h" #include "scatter3dcontroller_p.h" #include "declarativescatter_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "qscatterdataproxy.h" #include "qscatter3dseries.h" @@ -46,9 +46,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class DeclarativeScatter : public AbstractDeclarative { Q_OBJECT - Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) - Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) - Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged) + Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) + Q_PROPERTY(QValue3DAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) + Q_PROPERTY(QValue3DAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged) Q_PROPERTY(QQmlListProperty seriesList READ seriesList) Q_CLASSINFO("DefaultProperty", "seriesList") @@ -56,12 +56,12 @@ public: explicit DeclarativeScatter(QQuickItem *parent = 0); ~DeclarativeScatter(); - Q3DValueAxis *axisX() const; - void setAxisX(Q3DValueAxis *axis); - Q3DValueAxis *axisY() const; - void setAxisY(Q3DValueAxis *axis); - Q3DValueAxis *axisZ() const; - void setAxisZ(Q3DValueAxis *axis); + QValue3DAxis *axisX() const; + void setAxisX(QValue3DAxis *axis); + QValue3DAxis *axisY() const; + void setAxisY(QValue3DAxis *axis); + QValue3DAxis *axisZ() const; + void setAxisZ(QValue3DAxis *axis); QQmlListProperty seriesList(); static void appendSeriesFunc(QQmlListProperty *list, QScatter3DSeries *series); @@ -72,9 +72,9 @@ public: Q_INVOKABLE void removeSeries(QScatter3DSeries *series); signals: - void axisXChanged(Q3DValueAxis *axis); - void axisYChanged(Q3DValueAxis *axis); - void axisZChanged(Q3DValueAxis *axis); + void axisXChanged(QValue3DAxis *axis); + void axisYChanged(QValue3DAxis *axis); + void axisZChanged(QValue3DAxis *axis); protected: Scatter3DController *m_scatterController; diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 3ba5f923..efbec825 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "declarativesurface_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "qitemmodelsurfacedataproxy.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -50,32 +50,32 @@ DeclarativeSurface::~DeclarativeSurface() delete m_surfaceController; } -Q3DValueAxis *DeclarativeSurface::axisX() const +QValue3DAxis *DeclarativeSurface::axisX() const { - return static_cast(m_surfaceController->axisX()); + return static_cast(m_surfaceController->axisX()); } -void DeclarativeSurface::setAxisX(Q3DValueAxis *axis) +void DeclarativeSurface::setAxisX(QValue3DAxis *axis) { m_surfaceController->setAxisX(axis); } -Q3DValueAxis *DeclarativeSurface::axisY() const +QValue3DAxis *DeclarativeSurface::axisY() const { - return static_cast(m_surfaceController->axisY()); + return static_cast(m_surfaceController->axisY()); } -void DeclarativeSurface::setAxisY(Q3DValueAxis *axis) +void DeclarativeSurface::setAxisY(QValue3DAxis *axis) { m_surfaceController->setAxisY(axis); } -Q3DValueAxis *DeclarativeSurface::axisZ() const +QValue3DAxis *DeclarativeSurface::axisZ() const { - return static_cast(m_surfaceController->axisZ()); + return static_cast(m_surfaceController->axisZ()); } -void DeclarativeSurface::setAxisZ(Q3DValueAxis *axis) +void DeclarativeSurface::setAxisZ(QValue3DAxis *axis) { m_surfaceController->setAxisZ(axis); } diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index 2c9c2803..15e88c91 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -33,7 +33,7 @@ #include "abstractdeclarative_p.h" #include "surface3dcontroller_p.h" #include "declarativesurface_p.h" -#include "q3dvalueaxis.h" +#include "qvalue3daxis.h" #include "qsurfacedataproxy.h" #include "qsurface3dseries.h" @@ -47,9 +47,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class DeclarativeSurface : public AbstractDeclarative { Q_OBJECT - Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) - Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) - Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged) + Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) + Q_PROPERTY(QValue3DAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged) + Q_PROPERTY(QValue3DAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged) Q_PROPERTY(QQmlListProperty seriesList READ seriesList) Q_CLASSINFO("DefaultProperty", "seriesList") @@ -57,12 +57,12 @@ public: explicit DeclarativeSurface(QQuickItem *parent = 0); ~DeclarativeSurface(); - Q3DValueAxis *axisX() const; - void setAxisX(Q3DValueAxis *axis); - Q3DValueAxis *axisY() const; - void setAxisY(Q3DValueAxis *axis); - Q3DValueAxis *axisZ() const; - void setAxisZ(Q3DValueAxis *axis); + QValue3DAxis *axisX() const; + void setAxisX(QValue3DAxis *axis); + QValue3DAxis *axisY() const; + void setAxisY(QValue3DAxis *axis); + QValue3DAxis *axisZ() const; + void setAxisZ(QValue3DAxis *axis); QQmlListProperty seriesList(); static void appendSeriesFunc(QQmlListProperty *list, QSurface3DSeries *series); @@ -73,9 +73,9 @@ public: Q_INVOKABLE void removeSeries(QSurface3DSeries *series); signals: - void axisXChanged(Q3DValueAxis *axis); - void axisYChanged(Q3DValueAxis *axis); - void axisZChanged(Q3DValueAxis *axis); + void axisXChanged(QValue3DAxis *axis); + void axisYChanged(QValue3DAxis *axis); + void axisZChanged(QValue3DAxis *axis); private: Surface3DController *m_surfaceController; diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 73f0074c..24fe1b52 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -17,8 +17,8 @@ ****************************************************************************/ #include "chart.h" -#include -#include +#include +#include #include #include #include @@ -45,13 +45,13 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog) m_minval(-16.0f), m_maxval(20.0f), m_selectedBar(-1, -1), - m_autoAdjustingAxis(new Q3DValueAxis), - m_fixedRangeAxis(new Q3DValueAxis), - m_temperatureAxis(new Q3DValueAxis), - m_yearAxis(new Q3DCategoryAxis), - m_monthAxis(new Q3DCategoryAxis), - m_genericRowAxis(new Q3DCategoryAxis), - m_genericColumnAxis(new Q3DCategoryAxis), + m_autoAdjustingAxis(new QValue3DAxis), + m_fixedRangeAxis(new QValue3DAxis), + m_temperatureAxis(new QValue3DAxis), + m_yearAxis(new QCategory3DAxis), + m_monthAxis(new QCategory3DAxis), + m_genericRowAxis(new QCategory3DAxis), + m_genericColumnAxis(new QCategory3DAxis), m_temperatureData(new QBar3DSeries), m_temperatureData2(new QBar3DSeries), m_genericData(new QBar3DSeries), diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index 77b10093..c75e5024 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -110,13 +110,13 @@ private: QStringList m_months; QStringList m_years; QPoint m_selectedBar; - Q3DValueAxis *m_autoAdjustingAxis; - Q3DValueAxis *m_fixedRangeAxis; - Q3DValueAxis *m_temperatureAxis; - Q3DCategoryAxis *m_yearAxis; - Q3DCategoryAxis *m_monthAxis; - Q3DCategoryAxis *m_genericRowAxis; - Q3DCategoryAxis *m_genericColumnAxis; + QValue3DAxis *m_autoAdjustingAxis; + QValue3DAxis *m_fixedRangeAxis; + QValue3DAxis *m_temperatureAxis; + QCategory3DAxis *m_yearAxis; + QCategory3DAxis *m_monthAxis; + QCategory3DAxis *m_genericRowAxis; + QCategory3DAxis *m_genericColumnAxis; QBar3DSeries *m_temperatureData; QBar3DSeries *m_temperatureData2; QBar3DSeries *m_genericData; @@ -125,7 +125,7 @@ private: QBar3DSeries *m_dummyData3; QBar3DSeries *m_dummyData4; QBar3DSeries *m_dummyData5; - Q3DValueAxis *m_currentAxis; + QValue3DAxis *m_currentAxis; bool m_negativeValuesOn; bool m_useNullInputHandler; QAbstract3DInputHandler *m_defaultInputHandler; diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index fe94519a..c0fb4a04 100644 --- a/tests/kinectsurface/surfacedata.cpp +++ b/tests/kinectsurface/surfacedata.cpp @@ -20,7 +20,7 @@ #include "surfacedata.h" #include "QKinectWrapper.h" -#include +#include #include #include #include diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index 7ba5685f..9e8a5196 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -19,7 +19,7 @@ #define NOMINMAX #include "data.h" -#include +#include #include #include #include diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 2277ca3f..58add6ec 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -19,7 +19,7 @@ #include "scatterchart.h" #include #include -#include +#include #include #include #include @@ -43,9 +43,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_chart->activeTheme()->setFont(font); m_chart->setShadowQuality(QDataVis::ShadowQualityNone); m_chart->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront); - m_chart->setAxisX(new Q3DValueAxis); - m_chart->setAxisY(new Q3DValueAxis); - m_chart->setAxisZ(new Q3DValueAxis); + m_chart->setAxisX(new QValue3DAxis); + m_chart->setAxisY(new QValue3DAxis); + m_chart->setAxisZ(new QValue3DAxis); createAndAddSeries(); createAndAddSeries(); @@ -217,9 +217,9 @@ void ScatterDataModifier::resetAxes() m_chart->releaseAxis(m_chart->axisY()); m_chart->releaseAxis(m_chart->axisZ()); - m_chart->setAxisX(new Q3DValueAxis); - m_chart->setAxisY(new Q3DValueAxis); - m_chart->setAxisZ(new Q3DValueAxis); + m_chart->setAxisX(new QValue3DAxis); + m_chart->setAxisY(new QValue3DAxis); + m_chart->setAxisZ(new QValue3DAxis); m_chart->axisX()->setSegmentCount(5); m_chart->axisY()->setSegmentCount(5); m_chart->axisZ()->setSegmentCount(5); diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 92965c1c..c4fe111d 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index be96a696..bd44c1dc 100644 --- a/tests/surfacetest/graphmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "graphmodifier.h" -#include +#include #include #include #include @@ -55,9 +55,9 @@ GraphModifier::GraphModifier(Q3DSurface *graph) m_theSeries(new QSurface3DSeries), m_drawMode(QSurface3DSeries::DrawSurfaceAndWireframe) { - m_graph->setAxisX(new Q3DValueAxis); - m_graph->setAxisY(new Q3DValueAxis); - m_graph->setAxisZ(new Q3DValueAxis); + m_graph->setAxisX(new QValue3DAxis); + m_graph->setAxisY(new QValue3DAxis); + m_graph->setAxisZ(new QValue3DAxis); m_graph->axisX()->setRange(m_minX, m_minX + m_rangeX); m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); m_graph->addSeries(m_theSeries); -- cgit v1.2.3