OpenGeodeWeb-Viewer 1.17.2__tar.gz → 1.18.0__tar.gz

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.17.2
+Version: 1.18.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
@@ -19,7 +19,7 @@ Requires-Dist: contourpy>=1
 Requires-Dist: cycler>=0
 Requires-Dist: fonttools>=4
 Requires-Dist: frozenlist>=1
-Requires-Dist: idna==3.14
+Requires-Dist: idna==3.15
 Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.17.2"
+version = "1.18.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.17.2 → opengeodeweb_viewer-1.18.0}/requirements.txt

@@ -22,7 +22,7 @@ frozenlist>=1
     # via
     #   aiohttp
     #   aiosignal
-idna==3.14
+idna==3.15
     # via yarl
 kiwisolver>=1
     # via matplotlib

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.17.2
+Version: 1.18.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
@@ -19,7 +19,7 @@ Requires-Dist: contourpy>=1
 Requires-Dist: cycler>=0
 Requires-Dist: fonttools>=4
 Requires-Dist: frozenlist>=1
-Requires-Dist: idna==3.14
+Requires-Dist: idna==3.15
 Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/src/OpenGeodeWeb_Viewer.egg-info/SOURCES.txt

@@ -162,6 +162,8 @@ src/opengeodeweb_viewer/rpc/model/points/schemas/visibility.py
 src/opengeodeweb_viewer/rpc/model/schemas/__init__.py
 src/opengeodeweb_viewer/rpc/model/schemas/deregister.json
 src/opengeodeweb_viewer/rpc/model/schemas/deregister.py
+src/opengeodeweb_viewer/rpc/model/schemas/get_blocks_bounds.json
+src/opengeodeweb_viewer/rpc/model/schemas/get_blocks_bounds.py
 src/opengeodeweb_viewer/rpc/model/schemas/highlight.json
 src/opengeodeweb_viewer/rpc/model/schemas/highlight.py
 src/opengeodeweb_viewer/rpc/model/schemas/register.json

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/src/OpenGeodeWeb_Viewer.egg-info/requires.txt

@@ -6,7 +6,7 @@ contourpy>=1
 cycler>=0
 fonttools>=4
 frozenlist>=1
-idna==3.14
+idna==3.15
 kiwisolver>=1
 matplotlib>=3
 multidict>=6

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -4,6 +4,8 @@ import os
 # Third party imports
 from vtkmodules.vtkCommonDataModel import (
     vtkCompositeDataSet,
+    vtkBoundingBox,
+    vtkDataSet,
 )
 from vtkmodules.vtkRenderingCore import (
     vtkCompositeDataDisplayAttributes,
@@ -187,3 +189,19 @@ class VtkModelView(VtkObjectView):
 
         mapper.Modified()
         self.render(-1)
+
+    @exportRpc(model_prefix + model_schemas_dict["get_blocks_bounds"]["rpc"])
+    def getBlocksBounds(self, rpc_params: RpcParams) -> list[float]:
+        validate_schema(
+            rpc_params, self.model_schemas_dict["get_blocks_bounds"], self.model_prefix
+        )
+        params = schemas.GetBlocksBounds.from_dict(rpc_params)
+        pipeline = self.get_vtk_pipeline(params.id)
+        bbox = vtkBoundingBox()
+        for block_id in params.block_ids:
+            if isinstance(block := pipeline.blockDataSets[block_id], vtkDataSet):
+                bbox.AddBounds(block.GetBounds())
+
+        bounds = [0.0] * 6
+        bbox.GetBounds(bounds)
+        return bounds

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/src/opengeodeweb_viewer/rpc/model/schemas/__init__.py

@@ -1,4 +1,5 @@
 from .visibility import *
 from .register import *
 from .highlight import *
+from .get_blocks_bounds import *
 from .deregister import *

opengeodeweb_viewer-1.18.0/src/opengeodeweb_viewer/rpc/model/schemas/get_blocks_bounds.json

@@ -0,0 +1,16 @@
+{
+  "rpc": "get_blocks_bounds",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "block_ids": {
+      "type": "array",
+      "items": { "type": "integer" }
+    }
+  },
+  "required": ["id", "block_ids"],
+  "additionalProperties": false
+}

opengeodeweb_viewer-1.18.0/src/opengeodeweb_viewer/rpc/model/schemas/get_blocks_bounds.py

@@ -0,0 +1,12 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+from typing import List
+
+
+@dataclass
+class GetBlocksBounds(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    block_ids: List[int]
+    id: str

{opengeodeweb_viewer-1.17.2 → opengeodeweb_viewer-1.18.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -15,6 +15,7 @@ from vtkmodules.vtkRenderingCore import (
     vtkWorldPointPicker,
     vtkPicker,
     vtkCellPicker,
+    vtkPropPicker,
     vtkCompositePolyDataMapper,
 )
 from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackball
@@ -201,10 +202,16 @@ class VtkViewerView(VtkView):
             self.viewer_prefix,
         )
         params = schemas.GetPointPosition.from_dict(rpc_params)
-        xyz = [params.x, params.y, 0.0]
-        picker = vtkWorldPointPicker()
-        picker.Pick(xyz, self.get_renderer())
-        ppos = picker.GetPickPosition()
+        renderer = self.get_renderer()
+        # If clicking on an object
+        prop_picker = vtkPropPicker()
+        if prop_picker.Pick(params.x, params.y, 0.0, renderer):
+            ppos = prop_picker.GetPickPosition()
+            return {"x": ppos[0], "y": ppos[1], "z": ppos[2]}
+        # WorldPicker if notclicking on an object
+        world_picker = vtkWorldPointPicker()
+        world_picker.Pick([params.x, params.y, 0.0], renderer)
+        ppos = world_picker.GetPickPosition()
         return {"x": ppos[0], "y": ppos[1], "z": ppos[2]}
 
     def computeEpsilon(self, renderer: vtkRenderer, z: float) -> float: