Merge pull request #76 from Geode-solutions/next

Next

Author: SpliiT

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.8.1"
+version = "1.9.0-rc.1"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="team-web@geode-solutions.com" },

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

@@ -0,0 +1,13 @@
+{
+  "rpc": "set_z_scaling",
+  "type": "object",
+  "properties": {
+    "z_scale": {
+      "type": "number"
+    }
+  },
+  "required": [
+    "z_scale"
+  ],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -7,6 +7,7 @@
 from vtkmodules.vtkIOImage import vtkPNGWriter, vtkJPEGWriter
 from vtkmodules.vtkRenderingAnnotation import vtkCubeAxesActor
 from vtkmodules.vtkRenderingCore import vtkWindowToImageFilter
+from vtkmodules.vtkCommonTransforms import vtkTransform
 from wslink import register as exportRpc
 
 # Local application imports
@@ -277,3 +278,22 @@ def renderNow(self, params):
             params, self.viewer_schemas_dict["render_now"], self.viewer_prefix
         )
         self.render()
+
+    @exportRpc(viewer_prefix + viewer_schemas_dict["set_z_scaling"]["rpc"])
+    def setZScaling(self, params):
+
+        validate_schema(
+            params, self.viewer_schemas_dict["set_z_scaling"], self.viewer_prefix
+        )
+        z_scale = params["z_scale"]
+
+        renderWindow = self.getView("-1")
+        renderer = renderWindow.GetRenderers().GetFirstRenderer()
+
+        actors = renderer.GetActors()
+
+        for actor in actors:
+            transform = vtkTransform()
+            transform.Scale(1, 1, z_scale)
+            actor.SetUserTransform(transform)
+        self.render()

src/tests/data/images/viewer/polygon_attribute.jpeg

@@ -257,3 +257,44 @@ def test_render_now(server):
     )
 
     assert server.compare_image(3, "viewer/render_now.jpeg") == True
+
+
+def test_set_z_scaling(server):
+
+    server.call(
+        VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
+        [{"id": "12345678", "file_name": "polygon_attribute.vtp"}],
+    )
+    assert server.compare_image(3, "viewer/polygon_attribute.jpeg") == True
+
+    server.call(
+        VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
+        [{"id": "123456789", "file_name": "vertex_attribute.vtp"}],
+    )
+    assert server.compare_image(3, "viewer/vertex_and_polygon_attribute.jpeg") == True
+
+    camera_options = {
+        "focal_point": [6.05, 5.7, 1.5],
+        "view_up": [-0.019853719211915175, 0.9994261532466464, 0.02744438084681784],
+        "position": [-19.898328271321652, 5.221831172558093, 0.1417477620371277],
+        "view_angle": 30.0,
+        "clipping_range": [20.16946812228507, 31.94497749971925],
+    }
+
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["update_camera"]["rpc"],
+        [
+            {
+                "camera_options": camera_options,
+            }
+        ],
+    )
+    server.compare_image(3, "mesh/register.jpeg")
+
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["set_z_scaling"]["rpc"],
+        [{"z_scale": 2.5}],
+    )
+    assert server.compare_image(3, "viewer/set_z_scaling.jpeg") == True