OpenGeodeWeb-Viewer 1.25.1rc2__tar.gz → 1.26.0__tar.gz

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.25.1rc2
+Version: 1.26.0
 Summary: OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Viewer
@@ -35,7 +35,7 @@ Requires-Dist: vtk==9.5.2
 Requires-Dist: websocket-client==1.8.0
 Requires-Dist: wslink==1.12.4
 Requires-Dist: yarl>=1
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.1rc1
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.25.1-rc.2"
+version = "1.26.0"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/requirements.txt

@@ -63,4 +63,4 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.2.0
+opengeodeweb-microservice==1.*,>=1.2.1rc1

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.25.1rc2
+Version: 1.26.0
 Summary: OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Viewer
@@ -35,7 +35,7 @@ Requires-Dist: vtk==9.5.2
 Requires-Dist: websocket-client==1.8.0
 Requires-Dist: wslink==1.12.4
 Requires-Dist: yarl>=1
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.1rc1
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/OpenGeodeWeb_Viewer.egg-info/SOURCES.txt

@@ -64,12 +64,6 @@ src/opengeodeweb_viewer/rpc/mesh/points/schemas/color.json
 src/opengeodeweb_viewer/rpc/mesh/points/schemas/color.py
 src/opengeodeweb_viewer/rpc/mesh/points/schemas/size.json
 src/opengeodeweb_viewer/rpc/mesh/points/schemas/size.py
-src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_attribute.json
-src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_attribute.py
-src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_color_map.json
-src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_color_map.py
-src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_scalar_range.json
-src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_scalar_range.py
 src/opengeodeweb_viewer/rpc/mesh/points/schemas/visibility.json
 src/opengeodeweb_viewer/rpc/mesh/points/schemas/visibility.py
 src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py
@@ -222,6 +216,8 @@ src/opengeodeweb_viewer/rpc/viewer/schemas/set_background_color.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/set_background_color.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/set_z_scaling.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/set_z_scaling.py
+src/opengeodeweb_viewer/rpc/viewer/schemas/shrink.json
+src/opengeodeweb_viewer/rpc/viewer/schemas/shrink.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/take_screenshot.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/take_screenshot.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/update_camera.json

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/OpenGeodeWeb_Viewer.egg-info/requires.txt

@@ -22,4 +22,4 @@ vtk==9.5.2
 websocket-client==1.8.0
 wslink==1.12.4
 yarl>=1
-opengeodeweb-microservice==1.*,>=1.2.0
+opengeodeweb-microservice==1.*,>=1.2.1rc1

opengeodeweb_viewer-1.26.0/src/opengeodeweb_viewer/rpc/mesh/points/schemas/__init__.py

@@ -0,0 +1,3 @@
+from .visibility import *
+from .size import *
+from .color import *

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -82,7 +82,7 @@ class VtkModelView(VtkObjectView):
                 pipeline.get_block_style(block_id)["name"] = ""
                 if color_mode == "random":
                     geode_id = pipeline.blockGeodeIds[block_id]
-                    red, green, blue = deterministic_color(str(geode_id))
+                    red, green, blue = deterministic_color(f"{geode_id}_{block_id}")
                     attr.SetBlockColor(block_dataset, [red, green, blue])
                     attr.SetBlockOpacity(block_dataset, 1.0)
                     colors.append(

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/__init__.py

@@ -1,6 +1,7 @@
 from .update_data import *
 from .update_camera import *
 from .take_screenshot import *
+from .shrink import *
 from .set_z_scaling import *
 from .set_background_color import *
 from .reset_visualization import *

opengeodeweb_viewer-1.26.0/src/opengeodeweb_viewer/rpc/viewer/schemas/shrink.json

@@ -0,0 +1,24 @@
+{
+  "rpc": "shrink",
+  "type": "object",
+  "properties": {
+    "ids": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 32,
+        "maxLength": 32
+      }
+    },
+    "shrink_factor": {
+      "type": "number",
+      "minimum": 0.0,
+      "maximum": 1.0
+    }
+  },
+  "required": [
+    "ids",
+    "shrink_factor"
+  ],
+  "additionalProperties": false
+}

opengeodeweb_viewer-1.26.0/src/opengeodeweb_viewer/rpc/viewer/schemas/shrink.py

@@ -0,0 +1,12 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+from typing import List
+
+
+@dataclass
+class Shrink(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    ids: List[str]
+    shrink_factor: float

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -370,6 +370,14 @@ class VtkViewerView(VtkView):
         params = schemas.ClippingPlanes.from_dict(rpc_params)
         self.set_clipping_planes(params.ids, params.planes)
 
+    @exportRpc(viewer_prefix + viewer_schemas_dict["shrink"]["rpc"])
+    def setShrink(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params, self.viewer_schemas_dict["shrink"], self.viewer_prefix
+        )
+        params = schemas.Shrink.from_dict(rpc_params)
+        self.set_shrink(params.ids, params.shrink_factor)
+
     @exportRpc(viewer_prefix + viewer_schemas_dict["set_z_scaling"]["rpc"])
     def setZScaling(self, rpc_params: RpcParams) -> None:
         validate_schema(

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/opengeodeweb_viewer/vtk_pipeline.py

@@ -26,6 +26,7 @@ from vtkmodules.vtkFiltersExtraction import (
     vtkExtractGeometry,
     vtkExtractSelection,
 )
+from vtkmodules.vtkFiltersGeneral import vtkShrinkFilter
 from vtkmodules.vtkFiltersGeometry import vtkGeometryFilter
 from vtkmodules.vtkIOXML import vtkXMLReader
 
@@ -70,6 +71,7 @@ class VtkPipeline:
     filter: vtkGeometryFilter = field(default_factory=vtkGeometryFilter)
     actor: vtkActor = field(default_factory=vtkActor)
     clipping_filter: vtkExtractGeometry | None = None
+    shrink_filter: vtkShrinkFilter | None = None
     highlight: HighlightPipeline = field(default_factory=HighlightPipeline)
     blockDataSets: list[vtkDataObject | None] = field(default_factory=list)
     blockGeodeIds: list[str] = field(default_factory=list)

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -24,6 +24,7 @@ from vtkmodules.vtkCommonDataModel import (
     vtkSelectionNode,
 )
 from vtkmodules.vtkFiltersExtraction import vtkExtractGeometry
+from vtkmodules.vtkFiltersGeneral import vtkShrinkFilter
 from vtkmodules.vtkFiltersGeometry import vtkGeometryFilter
 from vtkmodules.vtkCommonCore import vtkIdTypeArray, vtkStringArray
 from vtkmodules.vtkRenderingAnnotation import (
@@ -167,15 +168,37 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
             pipeline = self.get_vtk_pipeline(data_id)
             pipeline.highlight.actor.VisibilityOff()
 
+    def update_pipeline_filter(self, pipeline: VtkPipeline) -> None:
+        current_input_port = pipeline.reader.GetOutputPort()
+        active_filters = [
+            filter_obj
+            for filter_obj in (pipeline.clipping_filter, pipeline.shrink_filter)
+            if filter_obj is not None
+        ]
+        for filter_obj in active_filters:
+            filter_obj.SetInputConnection(current_input_port)
+            current_input_port = filter_obj.GetOutputPort()
+        pipeline.filter.SetInputConnection(current_input_port)
+        pipeline.filter.Update()
+        filtered_dataset = pipeline.filter.GetOutputDataObject(0)
+        if isinstance(pipeline.mapper, vtkCompositePolyDataMapper):
+            pipeline.sync_composite_pipeline(filtered_dataset)
+            return
+        pipeline.mapper.SetInputConnection(pipeline.filter.GetOutputPort())
+        target_dataset = (
+            cast(vtkDataSet, filtered_dataset)
+            if active_filters
+            else pipeline.reader.GetOutputAsDataSet()
+        )
+        pipeline.restore_active_scalars(target_dataset)
+
     def set_clipping_planes(
         self, data_ids: list[str], planes_data: list[Plane]
     ) -> None:
         for data_id in data_ids:
             pipeline = self.get_vtk_pipeline(data_id)
-            is_composite = isinstance(pipeline.mapper, vtkCompositePolyDataMapper)
             if planes_data:
                 clipping_filter = vtkExtractGeometry()
-                clipping_filter.SetInputConnection(pipeline.reader.GetOutputPort())
                 implicit_boolean = vtkImplicitBoolean()
                 implicit_boolean.SetOperationTypeToIntersection()
                 for plane_info in planes_data:
@@ -185,22 +208,20 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
                     implicit_boolean.AddFunction(plane)
                 clipping_filter.SetImplicitFunction(implicit_boolean)
                 pipeline.clipping_filter = clipping_filter
-                input_port = clipping_filter.GetOutputPort()
             else:
                 pipeline.clipping_filter = None
-                input_port = pipeline.reader.GetOutputPort()
-            pipeline.filter.SetInputConnection(input_port)
-            pipeline.filter.Update()
-            filtered_dataset = pipeline.filter.GetOutputDataObject(0)
-            if is_composite:
-                pipeline.sync_composite_pipeline(filtered_dataset)
+            self.update_pipeline_filter(pipeline)
+
+    def set_shrink(self, data_ids: list[str], shrink_factor: float) -> None:
+        for data_id in data_ids:
+            pipeline = self.get_vtk_pipeline(data_id)
+            if shrink_factor < 1.0:
+                shrink_filter = vtkShrinkFilter()
+                shrink_filter.SetShrinkFactor(shrink_factor)
+                pipeline.shrink_filter = shrink_filter
             else:
-                pipeline.mapper.SetInputConnection(input_port)
-                pipeline.restore_active_scalars(
-                    cast(vtkDataSet, filtered_dataset)
-                    if planes_data
-                    else pipeline.reader.GetOutputAsDataSet()
-                )
+                pipeline.shrink_filter = None
+            self.update_pipeline_filter(pipeline)
 
     def swap_pick_mappers(self, data_ids: list[str], use_pick_mapper: bool) -> None:
         # Swap actor mappers between the default and the pick_mapper (where hidden blocks are pruned).

{opengeodeweb_viewer-1.25.1rc2 → opengeodeweb_viewer-1.26.0}/tests/test_viewer_protocols.py

@@ -370,7 +370,84 @@ def test_clipping_planes(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
     test_register_mesh(server, dataset_factory)
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["clipping_planes"]["rpc"],
+        [
+            {
+                "ids": [mesh_id],
+                "planes": [
+                    {
+                        "origin": [0.0, 0.0, 0.0],
+                        "normal": [1.0, 0.0, 0.0],
+                    }
+                ],
+            }
+        ],
+    )
+
+
+def test_shrink(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
+    test_register_mesh(server, dataset_factory)
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["shrink"]["rpc"],
+        [
+            {
+                "ids": [mesh_id],
+                "shrink_factor": 0.8,
+            }
+        ],
+    )
+    assert server.compare_image("viewer/shrink.jpeg") == True
+
+
+def test_clipping_then_shrink(
+    server: ServerMonitor, dataset_factory: Callable[..., str]
+) -> None:
+    test_register_mesh(server, dataset_factory)
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["clipping_planes"]["rpc"],
+        [
+            {
+                "ids": [mesh_id],
+                "planes": [
+                    {
+                        "origin": [0.0, 0.0, 0.0],
+                        "normal": [1.0, 0.0, 0.0],
+                    }
+                ],
+            }
+        ],
+    )
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["shrink"]["rpc"],
+        [
+            {
+                "ids": [mesh_id],
+                "shrink_factor": 0.8,
+            }
+        ],
+    )
+    assert server.compare_image("viewer/clipping_then_shrink.jpeg") == True
 
+
+def test_shrink_then_clipping(
+    server: ServerMonitor, dataset_factory: Callable[..., str]
+) -> None:
+    test_register_mesh(server, dataset_factory)
+    server.call(
+        VtkViewerView.viewer_prefix
+        + VtkViewerView.viewer_schemas_dict["shrink"]["rpc"],
+        [
+            {
+                "ids": [mesh_id],
+                "shrink_factor": 0.8,
+            }
+        ],
+    )
     server.call(
         VtkViewerView.viewer_prefix
         + VtkViewerView.viewer_schemas_dict["clipping_planes"]["rpc"],
@@ -386,3 +463,4 @@ def test_clipping_planes(
             }
         ],
     )
+    assert server.compare_image("viewer/clipping_then_shrink.jpeg") == True

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/__init__.py

@@ -1,6 +0,0 @@
-from .visibility import *
-from .vertex_scalar_range import *
-from .vertex_color_map import *
-from .vertex_attribute import *
-from .size import *
-from .color import *

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_attribute.json

@@ -1,19 +0,0 @@
-{
-  "rpc": "vertex_attribute",
-  "type": "object",
-  "properties": {
-    "id": {
-      "type": "string",
-      "minLength": 1
-    },
-    "name": {
-      "type": "string",
-      "minLength": 1
-    }
-  },
-  "required": [
-    "id",
-    "name"
-  ],
-  "additionalProperties": false
-}

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_attribute.py

@@ -1,11 +0,0 @@
-from dataclasses_json import DataClassJsonMixin
-from dataclasses import dataclass
-
-
-@dataclass
-class VertexAttribute(DataClassJsonMixin):
-    def __post_init__(self) -> None:
-        print(self, flush=True)
-
-    id: str
-    name: str

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_color_map.json

@@ -1,26 +0,0 @@
-{
-  "rpc": "color_map",
-  "type": "object",
-  "properties": {
-    "id": {
-      "type": "string",
-      "minLength": 1
-    },
-    "points": {
-      "type": "array",
-      "description": "Flat array of [value, r, g, b, ...]",
-      "items": {
-        "type": "number"
-      },
-      "minItems": 8
-    },
-    "minimum": {
-      "type": "number"
-    },
-    "maximum": {
-      "type": "number"
-    }
-  },
-  "required": ["id", "points", "minimum", "maximum"],
-  "additionalProperties": false
-}

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_color_map.py

@@ -1,15 +0,0 @@
-from dataclasses_json import DataClassJsonMixin
-from dataclasses import dataclass
-from typing import List
-
-
-@dataclass
-class VertexColorMap(DataClassJsonMixin):
-    def __post_init__(self) -> None:
-        print(self, flush=True)
-
-    id: str
-    maximum: float
-    minimum: float
-    points: List[float]
-    """Flat array of [value, r, g, b, ...]"""

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_scalar_range.json

@@ -1,22 +0,0 @@
-{
-  "rpc": "vertex_scalar_range",
-  "type": "object",
-  "properties": {
-    "id": {
-      "type": "string",
-      "minLength": 1
-    },
-    "minimum": {
-      "type": "number"
-    },
-    "maximum": {
-      "type": "number"
-    }
-  },
-  "required": [
-    "id",
-    "minimum",
-    "maximum"
-  ],
-  "additionalProperties": false
-}

opengeodeweb_viewer-1.25.1rc2/src/opengeodeweb_viewer/rpc/mesh/points/schemas/vertex_scalar_range.py

@@ -1,12 +0,0 @@
-from dataclasses_json import DataClassJsonMixin
-from dataclasses import dataclass
-
-
-@dataclass
-class VertexScalarRange(DataClassJsonMixin):
-    def __post_init__(self) -> None:
-        print(self, flush=True)
-
-    id: str
-    maximum: float
-    minimum: float