Fix misc minor issues

- Rename bars background mesh more logically
- Reorder ElementAxis enums logically
- Change the sun in rotations example to a custom item

Task-number: QTRD-3132
Change-Id: I00dacb68ebce222edc1a732cf7d14f1660934b36
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

10 files changed, 26 insertions, 27 deletions

diff --git a/examples/datavisualization/draggableaxes/axesinputhandler.cpp b/examples/datavisualization/draggableaxes/axesinputhandler.cpp
index ef7b871b..7b570e5c 100644
--- a/examples/datavisualization/draggableaxes/axesinputhandler.cpp
+++ b/examples/datavisualization/draggableaxes/axesinputhandler.cpp
@@ -76,12 +76,12 @@ void AxesInputHandler::handleElementSelected(QAbstract3DGraph::ElementType type)
     case QAbstract3DGraph::ElementAxisXLabel:
         m_state = StateDraggingX;
         break;
-    case QAbstract3DGraph::ElementAxisZLabel:
-        m_state = StateDraggingZ;
-        break;
     case QAbstract3DGraph::ElementAxisYLabel:
         m_state = StateDraggingY;
         break;
+    case QAbstract3DGraph::ElementAxisZLabel:
+        m_state = StateDraggingZ;
+        break;
     default:
         m_state = StateNormal;
         break;
diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
index 8daf4983..e161cf41 100644
--- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
+++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
@@ -154,7 +154,7 @@ Item {
             //! [5]
             onSelectedElementChanged: {
                 if (selectedElement >= AbstractGraph3D.ElementAxisXLabel
-                        && selectedElement <= AbstractGraph3D.ElementAxisYLabel)
+                        && selectedElement <= AbstractGraph3D.ElementAxisZLabel)
                     selectedAxisLabel = selectedElement
                 else
                     selectedAxisLabel = -1
@@ -216,16 +216,16 @@ Item {
             scatterGraph.axisX.min -= distance
             scatterGraph.axisX.max -= distance
             break
-        case AbstractGraph3D.ElementAxisZLabel:
-            distance = ((moveX + moveY) * cameraMultiplier) / dragSpeedModifier
-            scatterGraph.axisZ.min += distance
-            scatterGraph.axisZ.max += distance
-            break
         case AbstractGraph3D.ElementAxisYLabel:
             distance = moveY / dragSpeedModifier
             scatterGraph.axisY.min += distance
             scatterGraph.axisY.max += distance
             break
+        case AbstractGraph3D.ElementAxisZLabel:
+            distance = ((moveX + moveY) * cameraMultiplier) / dragSpeedModifier
+            scatterGraph.axisZ.min += distance
+            scatterGraph.axisZ.max += distance
+            break
         }
     }
     //! [7]
diff --git a/examples/datavisualization/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp
index c4b439b1..d2c2c52d 100644
--- a/examples/datavisualization/rotations/scatterdatamodifier.cpp
+++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp
@@ -23,6 +23,7 @@
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qscatter3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
+#include <QtDataVisualization/QCustom3DItem>
 #include <QtCore/qmath.h>
 
 using namespace QtDataVisualization;
@@ -40,7 +41,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
       m_fieldLines(12),
       m_arrowsPerLine(16),
       m_magneticField(new QScatter3DSeries),
-      m_sun(new QScatter3DSeries),
+      m_sun(new QCustom3DItem),
       m_magneticFieldArray(0),
       m_angleOffset(0.0f),
       m_angleStep(doublePi / m_arrowsPerLine / animationFrames)
@@ -62,17 +63,15 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_magneticField->setColorStyle(Q3DTheme::ColorStyleRangeGradient);
     //! [4]
 
-    // For 'sun' we use a custom large sphere.
-    m_sun->setItemSize(0.2f);
-    m_sun->setName(QStringLiteral("Sun"));
-    m_sun->setItemLabelFormat(QStringLiteral("@seriesName"));
-    m_sun->setMesh(QAbstract3DSeries::MeshUserDefined);
-    m_sun->setUserDefinedMesh(QStringLiteral(":/mesh/largesphere.obj"));
-    m_sun->setBaseColor(QColor(0xff, 0xBB, 0x00));
-    m_sun->dataProxy()->addItem(QScatterDataItem(QVector3D()));
+    // For 'sun' we use a custom large sphere
+    m_sun->setScaling(QVector3D(0.07f, 0.07f, 0.07f));
+    m_sun->setMeshFile(QStringLiteral(":/mesh/largesphere.obj"));
+    QImage sunColor = QImage(2, 2, QImage::Format_RGB32);
+    sunColor.fill(QColor(0xff, 0xbb, 0x00));
+    m_sun->setTextureImage(sunColor);
 
     m_graph->addSeries(m_magneticField);
-    m_graph->addSeries(m_sun);
+    m_graph->addCustomItem(m_sun);
 
     // Configure the axes according to the data
     m_graph->axisX()->setRange(-horizontalRange, horizontalRange);
@@ -171,7 +170,7 @@ void ScatterDataModifier::triggerRotation()
 
 void ScatterDataModifier::toggleSun()
 {
-    m_sun->setVisible(!m_graph->seriesList().at(1)->isVisible());
+    m_sun->setVisible(!m_sun->isVisible());
 }
 
 void ScatterDataModifier::toggleRotation()
diff --git a/examples/datavisualization/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h
index 9df1f26a..c4f7e7a4 100644
--- a/examples/datavisualization/rotations/scatterdatamodifier.h
+++ b/examples/datavisualization/rotations/scatterdatamodifier.h
@@ -47,7 +47,7 @@ private:
     int m_fieldLines;
     int m_arrowsPerLine;
     QScatter3DSeries *m_magneticField;
-    QScatter3DSeries *m_sun;
+    QCustom3DItem *m_sun;
     QScatterDataArray *m_magneticFieldArray;
     float m_angleOffset;
     float m_angleStep;
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
     };
 
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 2cdcafc8..374e6fb3 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -102,8 +102,8 @@ public:
         ElementNone = 0,
         ElementSeries,
         ElementAxisXLabel,
-        ElementAxisZLabel,
         ElementAxisYLabel,
+        ElementAxisZLabel,
         ElementCustomItem
     };