summaryrefslogtreecommitdiffstats
path: root/src/datavisualization
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization')
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp2
-rw-r--r--src/datavisualization/engine/engine.qrc2
-rw-r--r--src/datavisualization/engine/meshes/backgroundNoFloor.obj (renamed from src/datavisualization/engine/meshes/backgroundNegatives.obj)0
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.cpp4
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index ec13525b..b9448687 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -2337,7 +2337,7 @@ void Bars3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality
void Bars3DRenderer::loadBackgroundMesh()
{
ObjectHelper::resetObjectHelper(this, m_backgroundObj,
- QStringLiteral(":/defaultMeshes/negativeBackground"));
+ QStringLiteral(":/defaultMeshes/backgroundNoFloor"));
}
void Bars3DRenderer::loadGridLineMesh()
diff --git a/src/datavisualization/engine/engine.qrc b/src/datavisualization/engine/engine.qrc
index 4d95f030..673b6ee0 100644
--- a/src/datavisualization/engine/engine.qrc
+++ b/src/datavisualization/engine/engine.qrc
@@ -24,7 +24,7 @@
<file alias="bevelbarSmoothFull">meshes/barFilledSmooth.obj</file>
<file alias="barFull">meshes/cubeFilledFlat.obj</file>
<file alias="barSmoothFull">meshes/cubeFilledSmooth.obj</file>
- <file alias="negativeBackground">meshes/backgroundNegatives.obj</file>
+ <file alias="backgroundNoFloor">meshes/backgroundNoFloor.obj</file>
<file alias="minimal">meshes/minimalFlat.obj</file>
<file alias="minimalSmooth">meshes/minimalSmooth.obj</file>
<file alias="arrow">meshes/arrowFlat.obj</file>
diff --git a/src/datavisualization/engine/meshes/backgroundNegatives.obj b/src/datavisualization/engine/meshes/backgroundNoFloor.obj
index 0b94617f..0b94617f 100644
--- a/src/datavisualization/engine/meshes/backgroundNegatives.obj
+++ b/src/datavisualization/engine/meshes/backgroundNoFloor.obj
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index a232af6e..02606b85 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -131,10 +131,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
A series (i.e. an item in a series).
\value ElementAxisXLabel
X axis label.
- \value ElementAxisZLabel
- Z axis label.
\value ElementAxisYLabel
Y axis label.
+ \value ElementAxisZLabel
+ Z axis label.
\value ElementCustomItem
Custom item.
*/
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 23214c57..0db9fc4c 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -81,8 +81,8 @@ public:
ElementNone = 0,
ElementSeries,
ElementAxisXLabel,
- ElementAxisZLabel,
ElementAxisYLabel,
+ ElementAxisZLabel,
ElementCustomItem
};