OpenGeodeWeb-Viewer 1.15.8__tar.gz → 1.16.0__tar.gz

{opengeodeweb_viewer-1.15.8 → opengeodeweb_viewer-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.15.8
+Version: 1.16.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

{opengeodeweb_viewer-1.15.8 → opengeodeweb_viewer-1.16.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.15.8"
+version = "1.16.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.15.8 → opengeodeweb_viewer-1.16.0}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.15.8
+Version: 1.16.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

{opengeodeweb_viewer-1.15.8 → opengeodeweb_viewer-1.16.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -14,6 +14,8 @@ from vtkmodules.vtkRenderingCore import (
     vtkAbstractMapper,
     vtkWorldPointPicker,
     vtkPicker,
+    vtkCellPicker,
+    vtkCompositePolyDataMapper,
 )
 from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackball
 from vtkmodules.vtkCommonCore import reference
@@ -221,24 +223,34 @@ class VtkViewerView(VtkView):
         return math.sqrt(epsilon) * 0.0125
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["picked_ids"]["rpc"])
-    def pickedIds(self, rpc_params: RpcParams) -> dict[str, list[str]]:
+    def pickedIds(self, rpc_params: RpcParams) -> dict[str, list[str] | int | None]:
         validate_schema(
             rpc_params, self.viewer_schemas_dict["picked_ids"], self.viewer_prefix
         )
         params = schemas.PickedIDS.from_dict(rpc_params)
-        renderWindow = self.getView("-1")
-        renderer = renderWindow.GetRenderers().GetFirstRenderer()
-        picker = vtkPicker()
+        renderer = self.getView("-1").GetRenderers().GetFirstRenderer()
+        picker = vtkCellPicker(tolerance=0.005)
         picker.Pick(params.x, params.y, 0, renderer)
-        picked_actor = picker.GetActor()
-        array_ids = []
-        if picked_actor:
-            for id in params.ids:
-                if self.get_vtk_pipeline(id).actor == picked_actor:
-                    array_ids.append(id)
-                    break
-
-        return {"array_ids": array_ids}
+        actor = picker.GetActor()
+        viewer_id = picker.GetFlatBlockIndex()
+        array_ids = [
+            id for id in params.ids if self.get_vtk_pipeline(id).actor == actor
+        ]
+        if not array_ids:
+            return {"array_ids": [], "viewer_id": None}
+        if array_ids and viewer_id != -1:
+            pipeline = self.get_vtk_pipeline(array_ids[0])
+            mapper = pipeline.mapper
+            if isinstance(mapper, vtkCompositePolyDataMapper):
+                attr = mapper.GetCompositeDataDisplayAttributes()
+                if attr and not attr.GetBlockVisibility(
+                    pipeline.blockDataSets[viewer_id]
+                ):
+                    array_ids, viewer_id = [], -1
+        return {
+            "array_ids": array_ids,
+            "viewer_id": viewer_id if viewer_id != -1 else None,
+        }
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["grid_scale"]["rpc"])
     def toggleGridScale(self, rpc_params: RpcParams) -> None: