diff options
23 files changed, 91 insertions, 91 deletions
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index 2039968c..5a69a5fb 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -77,7 +77,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid m_chart->setBarSpacing(QSizeF(0.2, 0.2)); // Set bar type to flat pyramids - m_chart->setBarType(QDataVis::Pyramids, false); + m_chart->setBarType(QDataVis::MeshStylePyramids, false); #ifndef USE_STATIC_DATA // Set up sample space; make it as deep as it's wide diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index 3ec400b1..45e252bc 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -57,7 +57,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) m_chart->columnAxis()->setCategoryLabels(months); // Set bar type to cylinder - m_chart->setBarType(QDataVis::Cylinders, false); + m_chart->setBarType(QDataVis::MeshStyleCylinders, false); // Set shadows to medium m_chart->setShadowQuality(QDataVis::ShadowQualityMedium); diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index be5db0d3..879d8471 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -29,13 +29,13 @@ const int numberOfItems = 10000; ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) : m_chart(scatter), m_fontSize(40.0f), - m_style(QDataVis::Spheres), + m_style(QDataVis::MeshStyleSpheres), m_smooth(true) { QFont font = m_chart->font(); font.setPointSize(m_fontSize); m_chart->setFont(font); - m_chart->setObjectType(QDataVis::Spheres, true); + m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); m_chart->setTheme(QDataVis::ThemeEbony); m_chart->setShadowQuality(QDataVis::ShadowQualityHigh); m_chart->setCameraPreset(QDataVis::CameraPresetFront); diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index 5f7cd96a..50f2535a 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -39,7 +39,7 @@ ChartModifier::ChartModifier(Q3DBars *barchart) m_yearAxis(new Q3DCategoryAxis), m_monthAxis(new Q3DCategoryAxis), m_temperatureData(new QBarDataProxy), - m_style(QDataVis::BevelBars), + m_style(QDataVis::MeshStyleBevelBars), m_smooth(false) { m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December"; diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index cff730e7..26014c12 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -39,7 +39,7 @@ Bars3DController::Bars3DController(QRect boundRect) m_renderer(0) { // Default bar type; specific to bars - setBarType(QDataVis::BevelBars, false); + setBarType(QDataVis::MeshStyleBevelBars, false); setActiveDataProxy(0); @@ -311,15 +311,15 @@ bool Bars3DController::isBarSpecRelative() void Bars3DController::setBarType(QDataVis::MeshStyle style, bool smooth) { QString objFile; - if (style == QDataVis::Bars) + if (style == QDataVis::MeshStyleBars) objFile = QStringLiteral(":/defaultMeshes/bar"); - else if (style == QDataVis::Pyramids) + else if (style == QDataVis::MeshStylePyramids) objFile = QStringLiteral(":/defaultMeshes/pyramid"); - else if (style == QDataVis::Cones) + else if (style == QDataVis::MeshStyleCones) objFile = QStringLiteral(":/defaultMeshes/cone"); - else if (style == QDataVis::Cylinders) + else if (style == QDataVis::MeshStyleCylinders) objFile = QStringLiteral(":/defaultMeshes/cylinder"); - else if (style == QDataVis::BevelBars) + else if (style == QDataVis::MeshStyleBevelBars) objFile = QStringLiteral(":/defaultMeshes/bevelbar"); if (smooth) diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 8274675d..2649fe85 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -712,7 +712,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) glEnable(GL_DITHER); // Read color under cursor - if (QDataVis::InputOnScene == m_controller->inputState()) { + if (QDataVis::InputStateOnScene == m_controller->inputState()) { m_selection = Utils::getSelection(m_controller->inputPosition(), m_cachedBoundingRect.height()); } @@ -749,7 +749,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) bool selectionDirty = (m_selection != m_previousSelection || (m_selection != selectionSkipColor - && QDataVis::InputOnScene == m_controller->inputState() + && QDataVis::InputStateOnScene == m_controller->inputState() && !m_cachedIsSlicingActivated)); if (selectionDirty) { m_previousSelection = m_selection; @@ -1388,7 +1388,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) m_selectedBar = NULL; if (m_cachedIsSlicingActivated && (m_selection == selectionSkipColor - || QDataVis::InputOnOverview == m_controller->inputState())) { + || QDataVis::InputStateOnOverview == m_controller->inputState())) { m_cachedScene->setSlicingActive(false); } } else if (m_cachedSelectionMode >= QDataVis::SelectionModeSliceRow && selectionDirty) { diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 1a0ff961..b1b74b93 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -238,7 +238,7 @@ bool Q3DBars::isBarSpacingRelative() /*! * Sets the bar \a style to one of the values in \c QDataVis::MeshStyle. It is preset to - * \c QDataVis::Bars by default. A \a smooth flag can be used to set shading to smooth. + * \c QDataVis::MeshStyleBars by default. A \a smooth flag can be used to set shading to smooth. * It is \c false by default. * * \sa setMeshFileName() diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 64df5f04..78b60968 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -178,7 +178,7 @@ void Q3DScatter::setHeight(const int height) /*! * Sets the item \a style to one of the values in \c QDataVis::MeshStyle. It is preset to - * \c QDataVis::Spheres by default. A \a smooth flag can be used to set shading to smooth. + * \c QDataVis::MeshStyleSpheres by default. A \a smooth flag can be used to set shading to smooth. * It is \c false by default. * * \sa setMeshFileName() diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index 126f6736..e3b649db 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -35,7 +35,7 @@ Scatter3DController::Scatter3DController(QRect boundRect) m_selectedItemIndex(noSelectionIndex()) { // Default object type; specific to scatter - setObjectType(QDataVis::Spheres, false); + setObjectType(QDataVis::MeshStyleSpheres, false); setActiveDataProxy(new QScatterDataProxy); @@ -191,7 +191,7 @@ void Scatter3DController::handleAxisAutoAdjustRangeChangedInOrientation( void Scatter3DController::setObjectType(QDataVis::MeshStyle style, bool smooth) { QString objFile; - if (style == QDataVis::Spheres) { + if (style == QDataVis::MeshStyleSpheres) { if (smooth) objFile = QStringLiteral(":/defaultMeshes/sphereSmooth"); else diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 83e9a72f..61610e1a 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -438,7 +438,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) glEnable(GL_DITHER); // Read color under cursor - if (QDataVis::InputOnScene == m_controller->inputState()) { + if (QDataVis::InputStateOnScene == m_controller->inputState()) { m_selection = Utils::getSelection(m_controller->inputPosition(), m_cachedBoundingRect.height()); } diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index b0472c9b..4501c126 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -919,7 +919,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) glEnable(GL_TEXTURE_2D); // Draw selection buffer - if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputOnScene + if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputStateOnScene && m_surfaceObj && m_cachedSelectionMode > QDataVis::SelectionModeNone) { m_selectionShader->bind(); glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer); @@ -1649,7 +1649,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) m_selectionModeChanged = false; } - if (m_controller->inputState() == QDataVis::InputOnOverview) { + if (m_controller->inputState() == QDataVis::InputStateOnOverview) { if (m_cachedIsSlicingActivated) { m_cachedScene->setSlicingActive(false); m_selectionActive = false; diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h index d76e54e1..3d765ff2 100644 --- a/src/datavisualization/global/qdatavisualizationenums.h +++ b/src/datavisualization/global/qdatavisualizationenums.h @@ -37,22 +37,22 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject public: enum InputState { - InputNone = 0, - InputOnScene, - InputOnOverview, - InputOnSlice, - InputRotating, - InputOnPinch + InputStateNone = 0, + InputStateOnScene, + InputStateOnOverview, + InputStateOnSlice, + InputStateRotating, + InputStateOnPinch }; enum MeshStyle { - Bars = 0, - Pyramids, - Cones, - Cylinders, - BevelBars, - Spheres, - Dots + MeshStyleBars = 0, + MeshStylePyramids, + MeshStyleCones, + MeshStyleCylinders, + MeshStyleBevelBars, + MeshStyleSpheres, + MeshStyleDots }; enum CameraPreset { diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc index 4d6d651a..fde6a258 100644 --- a/src/datavisualization/global/qtdatavisualizationenums.qdoc +++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc @@ -27,17 +27,17 @@ Predefined input states for mouse and touch based input handlers. All states are not valid with all input handlers. - \value InputNone + \value InputStateNone Default "no input received" state. - \value InputOnScene + \value InputStateOnScene Mouse or touch input received on the 3D scene. - \value InputOnOverview + \value InputStateOnOverview Mouse or touch input received on the overview area. - \value InputOnSlice + \value InputStateOnSlice Mouse or touch input received on the slice view area. - \value InputRotating + \value InputStateRotating Rotation of the 3D geometry ongoing. - \value InputOnPinch + \value InputStateOnPinch Pinch/punch multitouch input received. */ @@ -46,19 +46,19 @@ Predefined mesh types. All styles are not usable with all visualization types. - \value Bars + \value MeshStyleBars Basic cubic bar. - \value Pyramids + \value MeshStylePyramids Four-sided pyramid. - \value Cones + \value MeshStyleCones Basic cone. - \value Cylinders + \value MeshStyleCylinders Basic cylinder. - \value BevelBars + \value MeshStyleBevelBars Slightly beveled (rounded) cubic bar. - \value Spheres + \value MeshStyleSpheres Sphere. Not usable in Q3DBars. - \value Dots + \value MeshStyleDots Triangular pyramid. Usable only with Q3DScatter. */ diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index bbbde7d8..f6e73a7d 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -88,14 +88,14 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos if (Qt::LeftButton == event->button()) { if (scene()->isSlicingActive()) { if (scene()->isPointInPrimarySubView(mousePos)) { - setInputState(QDataVis::InputOnOverview); + setInputState(QDataVis::InputStateOnOverview); } else if (scene()->isPointInSecondarySubView(mousePos)) { - setInputState(QDataVis::InputOnSlice); + setInputState(QDataVis::InputStateOnSlice); } else { - setInputState(QDataVis::InputNone); + setInputState(QDataVis::InputStateNone); } } else { - setInputState(QDataVis::InputOnScene); + setInputState(QDataVis::InputStateOnScene); // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); } @@ -105,7 +105,7 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos } else if (Qt::RightButton == event->button()) { // disable rotating when in slice view if (!scene()->isSlicingActive()) - setInputState(QDataVis::InputRotating); + setInputState(QDataVis::InputStateRotating); // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); } @@ -122,11 +122,11 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP #if defined (Q_OS_ANDROID) Q_UNUSED(mousePos); #else - if (QDataVis::InputRotating == inputState()) { + if (QDataVis::InputStateRotating == inputState()) { // update mouse positions to prevent jumping when releasing or repressing a button setInputPosition(mousePos); } - setInputState(QDataVis::InputNone); + setInputState(QDataVis::InputStateNone); #endif } @@ -140,7 +140,7 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) #if defined (Q_OS_ANDROID) Q_UNUSED(mousePos); #else - if (QDataVis::InputRotating == inputState()) { + if (QDataVis::InputStateRotating == inputState()) { // Calculate mouse movement since last frame QPointF rotations = scene()->activeCamera()->rotations(); float xRotation = rotations.x(); diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 9dd5f862..e111ff42 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -196,7 +196,7 @@ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputH q_ptr(q), m_prevDistance(0), m_previousInputPos(QPoint(0,0)), - m_inputState(QDataVis::InputNone), + m_inputState(QDataVis::InputStateNone), m_inputPosition(QPoint(0,0)), m_scene(0) { diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index fd7ce39c..b0eabd34 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -96,18 +96,18 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event) if (event->type() == QEvent::TouchBegin) { if (scene()->isSlicingActive()) { if (scene()->isPointInPrimarySubView(pointerPos.toPoint())) - setInputState(QDataVis::InputOnOverview); + setInputState(QDataVis::InputStateOnOverview); else if (scene()->isPointInSecondarySubView(pointerPos.toPoint())) - setInputState(QDataVis::InputOnSlice); + setInputState(QDataVis::InputStateOnSlice); else - setInputState(QDataVis::InputNone); + setInputState(QDataVis::InputStateNone); } else { // Handle possible tap-and-hold selection d_ptr->m_startHoldPos = pointerPos; d_ptr->m_touchHoldPos = d_ptr->m_startHoldPos; d_ptr->m_holdTimer->start(); // Start rotating - setInputState(QDataVis::InputRotating); + setInputState(QDataVis::InputStateRotating); setInputPosition(pointerPos.toPoint()); } } else if (event->type() == QEvent::TouchEnd) { @@ -148,7 +148,7 @@ void QTouch3DInputHandlerPrivate::handlePinchZoom(qreal distance) int prevDist = q_ptr->prevDistance(); if (prevDist > 0 && qAbs(prevDist - newDistance) < maxPinchJitter) return; - q_ptr->setInputState(QDataVis::InputOnPinch); + q_ptr->setInputState(QDataVis::InputStateOnPinch); Q3DCamera *camera = q_ptr->scene()->activeCamera(); int zoomLevel = camera->zoomLevel(); qreal zoomRate = qSqrt(qSqrt(zoomLevel)); @@ -169,7 +169,7 @@ void QTouch3DInputHandlerPrivate::handleTapAndHold() QPointF distance = m_startHoldPos - m_touchHoldPos; if (distance.manhattanLength() < maxTapAndHoldJitter) { q_ptr->setInputPosition(m_touchHoldPos.toPoint()); - q_ptr->setInputState(QDataVis::InputOnScene); + q_ptr->setInputState(QDataVis::InputStateOnScene); } } @@ -177,15 +177,15 @@ void QTouch3DInputHandlerPrivate::handleSelection(const QPointF &position) { QPointF distance = m_startHoldPos - position; if (distance.manhattanLength() < maxSelectionJitter) - q_ptr->setInputState(QDataVis::InputOnScene); + q_ptr->setInputState(QDataVis::InputStateOnScene); else - q_ptr->setInputState(QDataVis::InputNone); + q_ptr->setInputState(QDataVis::InputStateNone); q_ptr->setPreviousInputPos(position.toPoint()); } void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position) { - if (QDataVis::InputRotating == q_ptr->inputState()) { + if (QDataVis::InputStateRotating == q_ptr->inputState()) { Q3DScene *scene = q_ptr->scene(); Q3DCamera *camera = scene->activeCamera(); QPointF rotations = camera->rotations(); diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index c15ca495..9ed80106 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -163,9 +163,9 @@ QDataVis::MeshStyle DeclarativeBars::barType() const { QString objFile = m_shared->meshFileName(); if (objFile.contains("/sphere")) - return QDataVis::Spheres; + return QDataVis::MeshStyleSpheres; else - return QDataVis::Dots; + return QDataVis::MeshStyleDots; } void DeclarativeBars::setBarSmoothingEnabled(bool enabled) diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index 6447c781..346abec2 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -127,9 +127,9 @@ QDataVis::MeshStyle DeclarativeScatter::objectType() const { QString objFile = m_shared->meshFileName(); if (objFile.contains("/sphere")) - return QDataVis::Spheres; + return QDataVis::MeshStyleSpheres; else - return QDataVis::Dots; + return QDataVis::MeshStyleDots; } void DeclarativeScatter::setObjectSmoothingEnabled(bool enabled) diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index b58980a2..cd41a6be 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -406,34 +406,34 @@ void ChartModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setBarType(QDataVis::Cylinders, false); + m_chart->setBarType(QDataVis::MeshStyleCylinders, false); break; case 1: - m_chart->setBarType(QDataVis::Cylinders, true); + m_chart->setBarType(QDataVis::MeshStyleCylinders, true); break; case 2: - m_chart->setBarType(QDataVis::Cones, false); + m_chart->setBarType(QDataVis::MeshStyleCones, false); break; case 3: - m_chart->setBarType(QDataVis::Cones, true); + m_chart->setBarType(QDataVis::MeshStyleCones, true); break; case 4: - m_chart->setBarType(QDataVis::Bars, false); + m_chart->setBarType(QDataVis::MeshStyleBars, false); break; case 5: - m_chart->setBarType(QDataVis::Bars, true); + m_chart->setBarType(QDataVis::MeshStyleBars, true); break; case 6: - m_chart->setBarType(QDataVis::Pyramids, false); + m_chart->setBarType(QDataVis::MeshStylePyramids, false); break; case 7: - m_chart->setBarType(QDataVis::Pyramids, true); + m_chart->setBarType(QDataVis::MeshStylePyramids, true); break; case 8: - m_chart->setBarType(QDataVis::BevelBars, false); + m_chart->setBarType(QDataVis::MeshStyleBevelBars, false); break; case 9: - m_chart->setBarType(QDataVis::BevelBars, true); + m_chart->setBarType(QDataVis::MeshStyleBevelBars, true); break; } model++; diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index d69c35ce..b11be8d5 100644 --- a/tests/kinectsurface/surfacedata.cpp +++ b/tests/kinectsurface/surfacedata.cpp @@ -59,7 +59,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars m_scatter->setTheme(QDataVis::ThemeStoneMoss); m_scatter->setSelectionMode(QDataVis::SelectionModeNone); m_scatter->setGridVisible(false); - m_scatter->setObjectType(QDataVis::Dots, false); + m_scatter->setObjectType(QDataVis::MeshStyleDots, false); m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow); m_scatter->setCameraPosition(0.0, 85.0, 110); m_scatter->axisY()->setMin(-128); @@ -73,7 +73,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars m_bars->setTheme(QDataVis::ThemeQt); m_bars->setSelectionMode(QDataVis::SelectionModeNone); m_bars->setGridVisible(false); - m_bars->setBarType(QDataVis::Bars, true); + m_bars->setBarType(QDataVis::MeshStyleBars, true); #if 1 m_bars->setShadowQuality(QDataVis::ShadowQualityLow); #else @@ -98,7 +98,7 @@ SurfaceData::~SurfaceData() delete m_scatter; delete m_bars; delete m_surface; - } else if (m_mode == Bars) { + } else if (m_mode == MeshStyleBars) { delete m_scatter; delete m_surface; delete m_bars; @@ -201,7 +201,7 @@ void SurfaceData::setResolution(int selection) m_scatter->axisZ()->setMax(m_resolution.height() / 2); m_scatterDataArray = new QScatterDataArray; m_scatterDataArray->resize(m_resolution.width() * m_resolution.height()); - } else if (m_mode == Bars) { + } else if (m_mode == MeshStyleBars) { m_resize = true; m_resolution /= 4; m_barDataArray = new QBarDataArray; diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index 586fcfb6..0bf753cd 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -55,7 +55,7 @@ public: enum VisualizationMode { Surface = 0, Scatter, - Bars + MeshStyleBars }; public slots: diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 04e8db67..a10f0065 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -34,7 +34,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QFont font = m_chart->font(); font.setPointSize(m_fontSize); m_chart->setFont(font); - m_chart->setObjectType(QDataVis::Spheres, true); + m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); m_chart->setTheme(QDataVis::ThemeStoneMoss); m_chart->setShadowQuality(QDataVis::ShadowQualityHigh); m_chart->setCameraPreset(QDataVis::CameraPresetFront); @@ -96,16 +96,16 @@ void ScatterDataModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setObjectType(QDataVis::Dots, false); + m_chart->setObjectType(QDataVis::MeshStyleDots, false); break; case 1: - m_chart->setObjectType(QDataVis::Dots, true); + m_chart->setObjectType(QDataVis::MeshStyleDots, true); break; case 2: - m_chart->setObjectType(QDataVis::Spheres, false); + m_chart->setObjectType(QDataVis::MeshStyleSpheres, false); break; case 3: - m_chart->setObjectType(QDataVis::Spheres, true); + m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); break; } model++; diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 560c3a83..d0282ca0 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -81,7 +81,7 @@ MainApp::MainApp(Q3DBars *window) m_chart->setBarThickness(1.25); m_chart->setBarSpacing(QSizeF(0.2, -0.75)); // Set bar type, smooth cones - m_chart->setBarType(QDataVis::Cones, true); + m_chart->setBarType(QDataVis::MeshStyleCones, true); // Adjust zoom manually; automatic zoom level calculation does not work well with negative // spacings (in setBarSpacing) m_chart->setCameraPosition(10.0f, 5.0f, 70); @@ -90,7 +90,7 @@ MainApp::MainApp(Q3DBars *window) m_chart->setBarThickness(2.0); m_chart->setBarSpacing(QSizeF(0.0, 0.0)); // Set bar type, flat bars - m_chart->setBarType(QDataVis::Bars, false); + m_chart->setBarType(QDataVis::MeshStyleBars, false); // Adjust camera position m_chart->setCameraPosition(10.0f, 7.5f, 75); #endif |