summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r--src/datavisualization/engine/bars3dcontroller.cpp12
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp6
-rw-r--r--src/datavisualization/engine/q3dbars.cpp2
-rw-r--r--src/datavisualization/engine/q3dscatter.cpp2
-rw-r--r--src/datavisualization/engine/scatter3dcontroller.cpp4
-rw-r--r--src/datavisualization/engine/scatter3drenderer.cpp2
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp4
7 files changed, 16 insertions, 16 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 21:11:29 +0000