pull from next

Author: SpliiT

CHANGELOG.md

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

pyproject.toml

@@ -15,7 +15,6 @@ def __init__(self):
 
     def registerObject(self, id, file_name, reader, filter, mapper):
         actor = vtk.vtkActor()
-        actor.GetProperty().RenderPointsAsSpheresOn()
         self.register_object(id, reader, filter, actor, mapper, {})
 
         reader.SetFileName(os.path.join(self.DATA_FOLDER_PATH, file_name))

src/opengeodeweb_viewer/object/object_methods.py

@@ -44,6 +44,14 @@ def deregisterModel(self, params):
         id = params["id"]
         self.deregisterObject(id)
 
+    @exportRpc(model_prefix + model_schemas_dict["visibility"]["rpc"])
+    def setModelVisibility(self, params):
+        validate_schema(
+            params, self.model_schemas_dict["visibility"], self.model_prefix
+        )
+        id, visibility = params["id"], params["visibility"]
+        self.SetVisibility(id, visibility)
+
     @exportRpc(model_prefix + model_schemas_dict["points.visibility"]["rpc"])
     def setModelPointsVisibility(self, params):
         validate_schema(

src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -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,22 @@ 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.8, 0.0, 1, 0.2)
+        axes = vtk.vtkAxesActor()
+        widget.SetOrientationMarker(axes)
+        widget.EnabledOn()
+        widget.InteractiveOff()
+
+        self.register_object("axes", "", "", axes, "", "")
+        self.register_object("widget", "", "", widget, "", "")
+
         renderer.SetBackground([180 / 255, 180 / 255, 180 / 255])
 
         renderer.ResetCamera()
@@ -216,7 +232,7 @@ 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
         )
@@ -225,6 +241,14 @@ def updateData(self, params):
         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()
+
     @exportRpc(viewer_prefix + viewer_schemas_dict["update_camera"]["rpc"])
     def updateCamera(self, params):
         validate_schema(

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)
 
 
 # =============================================================================