Merge pull request #68 from Geode-solutions/next

Next

Author: JulienChampagnol

CHANGELOG.md

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.6.3"
+version = "1.7.0-rc.2"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },

pyproject.toml

@@ -0,0 +1,13 @@
+{
+  "rpc": "axes",
+  "type": "object",
+  "properties": {
+    "visibility": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "visibility"
+  ],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/rpc/viewer/schemas/axes.json

@@ -56,6 +56,21 @@ def resetVisualization(self, params):
         self.register_object("grid_scale", "", "", grid_scale, "", "")
 
         renderer.AddActor(grid_scale)
+
+        renderWindowInteractor = vtk.vtkRenderWindowInteractor()
+        renderWindowInteractor.SetRenderWindow(renderWindow)
+        renderWindowInteractor.GetInteractorStyle().SetCurrentStyleToTrackballCamera()
+        renderWindowInteractor.EnableRenderOff()
+        widget = vtk.vtkOrientationMarkerWidget()
+        widget.SetInteractor(renderWindowInteractor)
+        widget.SetViewport(0.75, 0.0, 0.95, 0.15)
+        axes = vtk.vtkAxesActor()
+        widget.SetOrientationMarker(axes)
+        widget.EnabledOn()
+        widget.InteractiveOff()
+
+        self.register_object("axes", "", "", axes, "", "")
+
         renderer.SetBackground([180 / 255, 180 / 255, 180 / 255])
 
         renderer.ResetCamera()
@@ -216,11 +231,19 @@ def pickedIds(self, params):
         return {"array_ids": array_ids}
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["grid_scale"]["rpc"])
-    def updateData(self, params):
+    def toggleGridScale(self, params):
         validate_schema(
             params, self.viewer_schemas_dict["grid_scale"], self.viewer_prefix
         )
         id, visibility = "grid_scale", params["visibility"]
         actor = self.get_object(id)["actor"]
         actor.SetVisibility(visibility)
         self.render()
+
+    @exportRpc(viewer_prefix + viewer_schemas_dict["axes"]["rpc"])
+    def toggleAxes(self, params):
+        validate_schema(params, self.viewer_schemas_dict["axes"], self.viewer_prefix)
+        id, visibility = "axes", params["visibility"]
+        actor = self.get_object(id)["actor"]
+        actor.SetVisibility(visibility)
+        self.render()

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -96,23 +96,9 @@ def initialize(self):
             renderWindow = vtk.vtkRenderWindow()
             renderWindow.AddRenderer(renderer)
             self.setSharedObject("renderer", renderer)
-
-            renderWindowInteractor = vtk.vtkRenderWindowInteractor()
-            renderWindowInteractor.SetRenderWindow(renderWindow)
-            renderWindowInteractor.GetInteractorStyle().SetCurrentStyleToTrackballCamera()
-            renderWindowInteractor.EnableRenderOff()
             self.getApplication().GetObjectIdMap().SetActiveObject("VIEW", renderWindow)
 
-            widget = vtk.vtkOrientationMarkerWidget()
-            widget.SetInteractor(renderWindowInteractor)
-            widget.SetViewport(0.0, 0.0, 0.2, 0.2)
-            axes = vtk.vtkAxesActor()
-
-            widget.SetOrientationMarker(axes)
-            widget.EnabledOn()
-            widget.InteractiveOff()
             renderWindow.SetOffScreenRendering(not _Server.debug)
-            self.setSharedObject("marker", widget)
 
 
 # =============================================================================