Adapt to QtGraphs changed API

Task-number: QTBUG-114091
Task-number: PYSIDE-2497
Change-Id: I62b6c50ea4cafd240ef75b2814849821f4eb2c3b
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

8 files changed, 60 insertions, 66 deletions

diff --git a/examples/graphs/3d/widgetgallery/axesinputhandler.py b/examples/graphs/3d/widgetgallery/axesinputhandler.py
index 768fac5ff..4c4202974 100644
--- a/examples/graphs/3d/widgetgallery/axesinputhandler.py
+++ b/examples/graphs/3d/widgetgallery/axesinputhandler.py
@@ -69,9 +69,8 @@ class AxesInputHandler(Q3DInputHandler):
     def handleAxisDragging(self):
         distance = 0.0
         # Get scene orientation from active camera
-        ac = self.scene().activeCamera()
-        xRotation = ac.xRotation()
-        yRotation = ac.yRotation()
+        xRotation = self.cameraXRotation()
+        yRotation = self.cameraYRotation()
 
         # Calculate directional drag multipliers based on rotation
         xMulX = cos(degrees(xRotation))
diff --git a/examples/graphs/3d/widgetgallery/bargraph.py b/examples/graphs/3d/widgetgallery/bargraph.py
index db0dd8e52..822acb4a9 100644
--- a/examples/graphs/3d/widgetgallery/bargraph.py
+++ b/examples/graphs/3d/widgetgallery/bargraph.py
@@ -48,12 +48,12 @@ class BarGraph(QObject):
         smoothCheckBox.setChecked(False)
 
         barStyleList = QComboBox(self._barsWidget)
-        barStyleList.addItem("Bar", QAbstract3DSeries.MeshBar)
-        barStyleList.addItem("Pyramid", QAbstract3DSeries.MeshPyramid)
-        barStyleList.addItem("Cone", QAbstract3DSeries.MeshCone)
-        barStyleList.addItem("Cylinder", QAbstract3DSeries.MeshCylinder)
-        barStyleList.addItem("Bevel bar", QAbstract3DSeries.MeshBevelBar)
-        barStyleList.addItem("Sphere", QAbstract3DSeries.MeshSphere)
+        barStyleList.addItem("Bar", QAbstract3DSeries.Mesh.Bar)
+        barStyleList.addItem("Pyramid", QAbstract3DSeries.Mesh.Pyramid)
+        barStyleList.addItem("Cone", QAbstract3DSeries.Mesh.Cone)
+        barStyleList.addItem("Cylinder", QAbstract3DSeries.Mesh.Cylinder)
+        barStyleList.addItem("Bevel bar", QAbstract3DSeries.Mesh.BevelBar)
+        barStyleList.addItem("Sphere", QAbstract3DSeries.Mesh.Sphere)
         barStyleList.setCurrentIndex(4)
 
         cameraButton = QPushButton(self._barsWidget)
diff --git a/examples/graphs/3d/widgetgallery/custominputhandler.py b/examples/graphs/3d/widgetgallery/custominputhandler.py
index 458ef62d1..15fe00e70 100644
--- a/examples/graphs/3d/widgetgallery/custominputhandler.py
+++ b/examples/graphs/3d/widgetgallery/custominputhandler.py
@@ -110,7 +110,7 @@ class CustomInputHandler(Q3DInputHandler):
         distance = 0.0
 
         # Get scene orientation from active camera
-        xRotation = self.scene().activeCamera().xRotation()
+        xRotation = self.scene().cameraXRotation()
 
         # Calculate directional drag multipliers based on rotation
         xMulX = cos(degrees(xRotation))
diff --git a/examples/graphs/3d/widgetgallery/graphmodifier.py b/examples/graphs/3d/widgetgallery/graphmodifier.py
index 938e09cff..2eaafa792 100644
--- a/examples/graphs/3d/widgetgallery/graphmodifier.py
+++ b/examples/graphs/3d/widgetgallery/graphmodifier.py
@@ -9,7 +9,7 @@ from PySide6.QtCore import QObject, QPropertyAnimation, Signal, Slot
 from PySide6.QtGui import QFont, QVector3D
 from PySide6.QtGraphs import (QAbstract3DGraph, QAbstract3DSeries,
                               QBarDataItem, QBar3DSeries, QCategory3DAxis,
-                              QValue3DAxis, Q3DCamera, Q3DTheme)
+                              QValue3DAxis, Q3DTheme)
 
 from rainfalldata import RainfallData
 
@@ -63,7 +63,7 @@ class GraphModifier(QObject):
         self._subSegments = 3
         self._minval = float(-20)
         self._maxval = float(20)
-        self._barMesh = QAbstract3DSeries.MeshBevelBar
+        self._barMesh = QAbstract3DSeries.Mesh.BevelBar
         self._smooth = False
         self._animationCameraX = QPropertyAnimation()
         self._animationCameraY = QPropertyAnimation()
@@ -75,7 +75,7 @@ class GraphModifier(QObject):
         self._defaultTarget = []
         self._customData = None
 
-        self._graph.setShadowQuality(QAbstract3DGraph.ShadowQualitySoftMedium)
+        self._graph.setShadowQuality(QAbstract3DGraph.ShadowQuality.SoftMedium)
         theme = self._graph.activeTheme()
         theme.setBackgroundEnabled(False)
         theme.setFont(QFont("Times New Roman", self._fontSize))
@@ -109,12 +109,12 @@ class GraphModifier(QObject):
 
         format = "Oulu - @colLabel @rowLabel: @valueLabel"
         self._primarySeries.setItemLabelFormat(format)
-        self._primarySeries.setMesh(QAbstract3DSeries.MeshBevelBar)
+        self._primarySeries.setMesh(QAbstract3DSeries.Mesh.BevelBar)
         self._primarySeries.setMeshSmooth(False)
 
         format = "Helsinki - @colLabel @rowLabel: @valueLabel"
         self._secondarySeries.setItemLabelFormat(format)
-        self._secondarySeries.setMesh(QAbstract3DSeries.MeshBevelBar)
+        self._secondarySeries.setMesh(QAbstract3DSeries.Mesh.BevelBar)
         self._secondarySeries.setMeshSmooth(False)
         self._secondarySeries.setVisible(False)
 
@@ -126,21 +126,20 @@ class GraphModifier(QObject):
         self.resetTemperatureData()
 
         # Set up property animations for zooming to the selected bar
-        camera = self._graph.scene().activeCamera()
-        self._defaultAngleX = camera.xRotation()
-        self._defaultAngleY = camera.yRotation()
-        self._defaultZoom = camera.zoomLevel()
-        self._defaultTarget = camera.target()
+        self._defaultAngleX = self._graph.cameraXRotation()
+        self._defaultAngleY = self._graph.cameraYRotation()
+        self._defaultZoom = self._graph.cameraZoomLevel()
+        self._defaultTarget = self._graph.cameraTargetPosition()
 
-        self._animationCameraX.setTargetObject(camera)
-        self._animationCameraY.setTargetObject(camera)
-        self._animationCameraZoom.setTargetObject(camera)
-        self._animationCameraTarget.setTargetObject(camera)
+        self._animationCameraX.setTargetObject(self._graph)
+        self._animationCameraY.setTargetObject(self._graph)
+        self._animationCameraZoom.setTargetObject(self._graph)
+        self._animationCameraTarget.setTargetObject(self._graph)
 
-        self._animationCameraX.setPropertyName(b"xRotation")
-        self._animationCameraY.setPropertyName(b"yRotation")
-        self._animationCameraZoom.setPropertyName(b"zoomLevel")
-        self._animationCameraTarget.setPropertyName(b"target")
+        self._animationCameraX.setPropertyName(b"cameraXRotation")
+        self._animationCameraY.setPropertyName(b"cameraYRotation")
+        self._animationCameraZoom.setPropertyName(b"cameraZoomLevel")
+        self._animationCameraTarget.setPropertyName(b"cameraTargetPosition")
 
         duration = 1700
         self._animationCameraX.setDuration(duration)
@@ -206,16 +205,15 @@ class GraphModifier(QObject):
         self._animationCameraTarget.stop()
 
         # Restore camera target in case animation has changed it
-        self._graph.scene().activeCamera().setTarget(QVector3D(0.0, 0.0, 0.0))
+        self._graph.setCameraTargetPosition(QVector3D(0.0, 0.0, 0.0))
 
-        self._preset = Q3DCamera.CameraPresetFront.value
+        self._preset = QAbstract3DGraph.CameraPreset.Front.value
 
-        camera = self._graph.scene().activeCamera()
-        camera.setCameraPreset(Q3DCamera.CameraPreset(self._preset))
+        self._graph.setCameraPreset(QAbstract3DGraph.CameraPreset(self._preset))
 
         self._preset += 1
-        if self._preset > Q3DCamera.CameraPresetDirectlyBelow.value:
-            self._preset = Q3DCamera.CameraPresetFrontLow.value
+        if self._preset > QAbstract3DGraph.CameraPreset.DirectlyBelow.value:
+            self._preset = QAbstract3DGraph.CameraPreset.FrontLow.value
 
     @Slot(int)
     def changeTheme(self, theme):
@@ -277,11 +275,10 @@ class GraphModifier(QObject):
         self._animationCameraZoom.stop()
         self._animationCameraTarget.stop()
 
-        camera = self._graph.scene().activeCamera()
-        currentX = camera.xRotation()
-        currentY = camera.yRotation()
-        currentZoom = camera.zoomLevel()
-        currentTarget = camera.target()
+        currentX = self._graph.cameraXRotation()
+        currentY = self._graph.cameraYRotation()
+        currentZoom = self._graph.cameraZoomLevel()
+        currentTarget = self._graph.cameraTargetPosition()
 
         self._animationCameraX.setStartValue(currentX)
         self._animationCameraY.setStartValue(currentY)
diff --git a/examples/graphs/3d/widgetgallery/highlightseries.py b/examples/graphs/3d/widgetgallery/highlightseries.py
index 93ef3a751..8c7b91633 100644
--- a/examples/graphs/3d/widgetgallery/highlightseries.py
+++ b/examples/graphs/3d/widgetgallery/highlightseries.py
@@ -91,4 +91,4 @@ class HighlightSeries(QSurface3DSeries):
         gr.setColorAt(DARK_RED_POS * ratio, Qt.darkRed)
 
         self.setBaseGradient(gr)
-        self.setColorStyle(Q3DTheme.ColorStyleRangeGradient)
+        self.setColorStyle(Q3DTheme.ColorStyle.RangeGradient)
diff --git a/examples/graphs/3d/widgetgallery/scatterdatamodifier.py b/examples/graphs/3d/widgetgallery/scatterdatamodifier.py
index a9ca38224..15064b412 100644
--- a/examples/graphs/3d/widgetgallery/scatterdatamodifier.py
+++ b/examples/graphs/3d/widgetgallery/scatterdatamodifier.py
@@ -7,7 +7,7 @@ from PySide6.QtCore import QObject, Signal, Slot, Qt
 from PySide6.QtGui import QVector3D
 from PySide6.QtGraphs import (QAbstract3DGraph, QAbstract3DSeries,
                               QScatterDataItem, QScatterDataProxy,
-                              QScatter3DSeries, Q3DCamera, Q3DTheme)
+                              QScatter3DSeries, Q3DTheme)
 
 from axesinputhandler import AxesInputHandler
 
@@ -29,7 +29,7 @@ class ScatterDataModifier(QObject):
 
         self._graph = scatter
 
-        self._style = QAbstract3DSeries.MeshSphere
+        self._style = QAbstract3DSeries.Mesh.Sphere
         self._smooth = True
         self._inputHandler = AxesInputHandler(scatter)
         self._autoAdjust = True
@@ -37,16 +37,17 @@ class ScatterDataModifier(QObject):
         self._CURVE_DIVIDER = LOWER_CURVE_DIVIDER
         self._inputHandler = AxesInputHandler(scatter)
 
-        self._graph.activeTheme().setType(Q3DTheme.ThemeStoneMoss)
-        self._graph.setShadowQuality(QAbstract3DGraph.ShadowQualitySoftHigh)
-        self._graph.scene().activeCamera().setCameraPreset(Q3DCamera.CameraPresetFront)
-        self._graph.scene().activeCamera().setZoomLevel(80.0)
+        self._graph.activeTheme().setType(Q3DTheme.Theme.StoneMoss)
+        self._graph.setShadowQuality(QAbstract3DGraph.ShadowQuality.SoftHigh)
+        self._graph.setCameraPreset(QAbstract3DGraph.CameraPreset.Front)
+        self._graph.setCameraZoomLevel(80.0)
 
         self._proxy = QScatterDataProxy()
         self._series = QScatter3DSeries(self._proxy)
         self._series.setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel")
         self._series.setMeshSmooth(self._smooth)
         self._graph.addSeries(self._series)
+        self._preset = QAbstract3DGraph.CameraPreset.FrontLow.value
 
         # Give ownership of the handler to the graph and make it the active
         # handler
@@ -98,14 +99,12 @@ class ScatterDataModifier(QObject):
 
     @Slot()
     def changePresetCamera(self):
-        preset = Q3DCamera.CameraPresetFrontLow.value
-
         camera = self._graph.scene().activeCamera()
-        camera.setCameraPreset(Q3DCamera.CameraPreset(preset))
+        camera.setCameraPreset(QAbstract3DGraph.CameraPreset(self._preset))
 
-        preset += 1
-        if preset > Q3DCamera.CameraPresetDirectlyBelow.value:
-            preset = Q3DCamera.CameraPresetFrontLow.value
+        self._preset += 1
+        if self._preset > QAbstract3DGraph.CameraPreset.DirectlyBelow.value:
+            self._preset = QAbstract3DGraph.CameraPreset.FrontLow.value
 
     @Slot(QAbstract3DGraph.ShadowQuality)
     def shadowQualityUpdatedByVisual(self, sq):
diff --git a/examples/graphs/3d/widgetgallery/scattergraph.py b/examples/graphs/3d/widgetgallery/scattergraph.py
index 236348e55..79e8933eb 100644
--- a/examples/graphs/3d/widgetgallery/scattergraph.py
+++ b/examples/graphs/3d/widgetgallery/scattergraph.py
@@ -56,10 +56,10 @@ class ScatterGraph(QObject):
         smoothCheckBox.setChecked(True)
 
         itemStyleList = QComboBox(self._scatterWidget)
-        itemStyleList.addItem("Sphere", QAbstract3DSeries.MeshSphere)
-        itemStyleList.addItem("Cube", QAbstract3DSeries.MeshCube)
-        itemStyleList.addItem("Minimal", QAbstract3DSeries.MeshMinimal)
-        itemStyleList.addItem("Point", QAbstract3DSeries.MeshPoint)
+        itemStyleList.addItem("Sphere", QAbstract3DSeries.Mesh.Sphere)
+        itemStyleList.addItem("Cube", QAbstract3DSeries.Mesh.Cube)
+        itemStyleList.addItem("Minimal", QAbstract3DSeries.Mesh.Minimal)
+        itemStyleList.addItem("Point", QAbstract3DSeries.Mesh.Point)
         itemStyleList.setCurrentIndex(0)
 
         themeList = QComboBox(self._scatterWidget)
diff --git a/examples/graphs/3d/widgetgallery/surfacegraphmodifier.py b/examples/graphs/3d/widgetgallery/surfacegraphmodifier.py
index cb0ec4a8a..b2706c6fa 100644
--- a/examples/graphs/3d/widgetgallery/surfacegraphmodifier.py
+++ b/examples/graphs/3d/widgetgallery/surfacegraphmodifier.py
@@ -12,7 +12,7 @@ from PySide6.QtGraphs import (QAbstract3DGraph, QCustom3DItem,
                               QCustom3DLabel, QHeightMapSurfaceDataProxy,
                               QValue3DAxis, QSurfaceDataItem,
                               QSurfaceDataProxy, QSurface3DSeries,
-                              Q3DInputHandler, Q3DCamera, Q3DTheme)
+                              Q3DInputHandler, Q3DTheme)
 
 
 from highlightseries import HighlightSeries
@@ -73,10 +73,9 @@ class SurfaceGraphModifier(QObject):
         self._customInputHandler = None
         self._defaultInputHandler = Q3DInputHandler()
 
-        ac = self._graph.scene().activeCamera()
-        ac.setZoomLevel(85.0)
-        ac.setCameraPreset(Q3DCamera.CameraPresetIsometricRight)
-        self._graph.activeTheme().setType(Q3DTheme.ThemeRetro)
+        self._graph.setCameraZoomLevel(85.0)
+        self._graph.setCameraPreset(QAbstract3DGraph.CameraPreset.IsometricRight)
+        self._graph.activeTheme().setType(Q3DTheme.Theme.Retro)
 
         self._x_axis = QValue3DAxis()
         self._y_axis = QValue3DAxis()
@@ -128,19 +127,19 @@ class SurfaceGraphModifier(QObject):
         grOne.setColorAt(0.5, Qt.darkGray)
         grOne.setColorAt(1.0, Qt.gray)
         self._heightMapSeriesOne.setBaseGradient(grOne)
-        self._heightMapSeriesOne.setColorStyle(Q3DTheme.ColorStyleRangeGradient)
+        self._heightMapSeriesOne.setColorStyle(Q3DTheme.ColorStyle.RangeGradient)
 
         grTwo = QLinearGradient()
         grTwo.setColorAt(0.39, Qt.blue)
         grTwo.setColorAt(0.4, Qt.white)
         self._heightMapSeriesTwo.setBaseGradient(grTwo)
-        self._heightMapSeriesTwo.setColorStyle(Q3DTheme.ColorStyleRangeGradient)
+        self._heightMapSeriesTwo.setColorStyle(Q3DTheme.ColorStyle.RangeGradient)
 
         grThree = QLinearGradient()
         grThree.setColorAt(0.0, Qt.white)
         grThree.setColorAt(0.05, Qt.black)
         self._heightMapSeriesThree.setBaseGradient(grThree)
-        self._heightMapSeriesThree.setColorStyle(Q3DTheme.ColorStyleRangeGradient)
+        self._heightMapSeriesThree.setColorStyle(Q3DTheme.ColorStyle.RangeGradient)
 
         # Custom items and label
         self._graph.selectedElementChanged.connect(self.handleElementSelected)
@@ -420,7 +419,7 @@ class SurfaceGraphModifier(QObject):
         gr.setColorAt(1.0, Qt.yellow)
 
         self._sqrtSinSeries.setBaseGradient(gr)
-        self._sqrtSinSeries.setColorStyle(Q3DTheme.ColorStyleRangeGradient)
+        self._sqrtSinSeries.setColorStyle(Q3DTheme.ColorStyle.RangeGradient)
 
     def setGreenToRedGradient(self):
         gr = QLinearGradient()
@@ -430,7 +429,7 @@ class SurfaceGraphModifier(QObject):
         gr.setColorAt(1.0, Qt.darkRed)
 
         self._sqrtSinSeries.setBaseGradient(gr)
-        self._sqrtSinSeries.setColorStyle(Q3DTheme.ColorStyleRangeGradient)
+        self._sqrtSinSeries.setColorStyle(Q3DTheme.ColorStyle.RangeGradient)
 
     @Slot(bool)
     def toggleItemOne(self, show):