OpenGeodeWeb-Viewer 1.19.0__tar.gz → 1.20.0__tar.gz

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.19.0
+Version: 1.20.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.19.0 → opengeodeweb_viewer-1.20.0}/pyproject.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.19.0
+Version: 1.20.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.19.0 → opengeodeweb_viewer-1.20.0}/src/OpenGeodeWeb_Viewer.egg-info/SOURCES.txt

@@ -191,8 +191,8 @@ src/opengeodeweb_viewer/rpc/viewer/schemas/get_point_position.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/get_point_position.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/grid_scale.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/grid_scale.py
-src/opengeodeweb_viewer/rpc/viewer/schemas/hover_highlight.json
-src/opengeodeweb_viewer/rpc/viewer/schemas/hover_highlight.py
+src/opengeodeweb_viewer/rpc/viewer/schemas/highlight.json
+src/opengeodeweb_viewer/rpc/viewer/schemas/highlight.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/picked_ids.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/picked_ids.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/render.json

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/src/opengeodeweb_viewer/object/object_methods.py

@@ -47,7 +47,7 @@ class VtkObjectView(VtkView):
             if actor.visibility == True:
                 resetCamara = False
         renderer.AddActor(data.actor)
-        renderer.AddActor(data.hoverHighlight.actor)
+        renderer.AddActor(data.highlight.actor)
         if resetCamara:
             renderer.ResetCamera()
 
@@ -56,7 +56,7 @@ class VtkObjectView(VtkView):
         renderWindow = self.getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
         renderer.RemoveActor(pipeline.actor)
-        renderer.RemoveActor(pipeline.hoverHighlight.actor)
+        renderer.RemoveActor(pipeline.highlight.actor)
         self.deregister_object(data_id)
 
     def SetVisibility(self, data_id: str, visibility: bool) -> None:
@@ -179,7 +179,7 @@ class VtkObjectView(VtkView):
         actor.SetUseBounds(False)
 
     def highlight(self, pipeline: VtkPipeline) -> None:
-        highlight = pipeline.hoverHighlight
+        highlight = pipeline.highlight
         self._apply_highlight_style(highlight.actor, highlight.mapper)
         input_port = (
             pipeline.filter.GetOutputPort()

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -176,10 +176,10 @@ class VtkMeshView(VtkObjectView):
         pipeline = self.get_vtk_pipeline(params.id)
         if params.visibility:
             dataset = pipeline.reader.GetOutputDataObject(0)
-            pipeline.hoverHighlight.mapper.SetInputDataObject(dataset)
+            pipeline.highlight.mapper.SetInputDataObject(dataset)
         else:
-            pipeline.hoverHighlight.mapper.SetInputConnection(
-                pipeline.hoverHighlight.extractSelection.GetOutputPort()
+            pipeline.highlight.mapper.SetInputConnection(
+                pipeline.highlight.extractSelection.GetOutputPort()
             )
-        pipeline.hoverHighlight.actor.SetVisibility(params.visibility)
+        pipeline.highlight.actor.SetVisibility(params.visibility)
         self.render(-1)

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -177,12 +177,12 @@ class VtkModelView(VtkObjectView):
                 if isinstance(block, vtkDataSet):
                     append.AddInputData(block)
             append.Update()
-            pipeline.hoverHighlight.mapper.SetInputDataObject(append.GetOutput())
+            pipeline.highlight.mapper.SetInputDataObject(append.GetOutput())
         else:
-            pipeline.hoverHighlight.mapper.SetInputConnection(
-                pipeline.hoverHighlight.extractSelection.GetOutputPort()
+            pipeline.highlight.mapper.SetInputConnection(
+                pipeline.highlight.extractSelection.GetOutputPort()
             )
-        pipeline.hoverHighlight.actor.SetVisibility(params.visibility)
+        pipeline.highlight.actor.SetVisibility(params.visibility)
         self.render(-1)
 
     @exportRpc(model_prefix + model_schemas_dict["get_blocks_bounds"]["rpc"])

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/__init__.py

@@ -7,7 +7,7 @@ from .reset_visualization import *
 from .reset_camera import *
 from .render import *
 from .picked_ids import *
-from .hover_highlight import *
+from .highlight import *
 from .grid_scale import *
 from .get_point_position import *
 from .axes import *

opengeodeweb_viewer-1.19.0/src/opengeodeweb_viewer/rpc/viewer/schemas/hover_highlight.json → opengeodeweb_viewer-1.20.0/src/opengeodeweb_viewer/rpc/viewer/schemas/highlight.json

@@ -1,5 +1,5 @@
 {
-  "rpc": "hover_highlight",
+  "rpc": "highlight",
   "type": "object",
   "properties": {
     "x": {

opengeodeweb_viewer-1.19.0/src/opengeodeweb_viewer/rpc/viewer/schemas/hover_highlight.py → opengeodeweb_viewer-1.20.0/src/opengeodeweb_viewer/rpc/viewer/schemas/highlight.py

@@ -10,7 +10,7 @@ class FieldType(Enum):
 
 
 @dataclass
-class HoverHighlight(DataClassJsonMixin):
+class Highlight(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -303,44 +303,82 @@ class VtkViewerView(VtkView):
         )
         self.render()
 
-    @exportRpc(viewer_prefix + viewer_schemas_dict["hover_highlight"]["rpc"])
-    def setHoverHighlight(self, rpc_params: RpcParams) -> None:
+    @exportRpc(viewer_prefix + viewer_schemas_dict["highlight"]["rpc"])
+    def setHighlight(
+        self, rpc_params: RpcParams
+    ) -> dict[str, str | int | None | dict[str, list[float] | float]]:
         validate_schema(
-            rpc_params, self.viewer_schemas_dict["hover_highlight"], self.viewer_prefix
+            rpc_params, self.viewer_schemas_dict["highlight"], self.viewer_prefix
         )
-        params = schemas.HoverHighlight.from_dict(rpc_params)
+        params = schemas.Highlight.from_dict(rpc_params)
         picker = vtkCellPicker(tolerance=0.005)
         picker.Pick(params.x, params.y, 0, self.get_renderer())
-        self.clearHoverHighlights(params.ids)
+        self.clear_highlights(params.ids)
         actor = picker.GetActor()
-        pipeline = next(
-            (
-                self.get_vtk_pipeline(id)
-                for id in params.ids
-                if self.get_vtk_pipeline(id).actor == actor
-            ),
-            None,
+        pipeline_id = next(
+            (id for id in params.ids if self.get_vtk_pipeline(id).actor == actor), None
         )
-        if pipeline:
-            id_to_select = (
-                picker.GetCellId()
+        id_to_select = (
+            picker.GetCellId()
+            if params.field_type == schemas.FieldType.CELL
+            else picker.GetPointId()
+        )
+
+        if not pipeline_id or id_to_select == -1:
+            self.render(-1)
+            return {}
+
+        pipeline = self.get_vtk_pipeline(pipeline_id)
+        dataset = None
+        geode_id = None
+        if isinstance(pipeline.mapper, vtkCompositePolyDataMapper):
+            flat_index = picker.GetFlatBlockIndex()
+            dataset = (
+                pipeline.blockDataSets[flat_index]
+                if 0 <= flat_index < len(pipeline.blockDataSets)
+                else None
+            )
+            geode_id = (
+                pipeline.blockGeodeIds[flat_index]
+                if 0 <= flat_index < len(pipeline.blockGeodeIds)
+                else None
+            )
+
+        self.update_highlight(pipeline, id_to_select, params.field_type.value, dataset)
+        self.render(-1)
+
+        data_obj = dataset or pipeline.reader.GetOutputDataObject(0)
+        data_attributes = {}
+        if isinstance(data_obj, vtkDataSet):
+            field_data = (
+                data_obj.GetCellData()
                 if params.field_type == schemas.FieldType.CELL
-                else picker.GetPointId()
+                else data_obj.GetPointData()
             )
-            if id_to_select != -1:
-                dataset = None
-                if isinstance(pipeline.mapper, vtkCompositePolyDataMapper):
-                    flat_index = picker.GetFlatBlockIndex()
-                    block = (
-                        pipeline.blockDataSets[flat_index]
-                        if 0 <= flat_index < len(pipeline.blockDataSets)
-                        else None
+            for array_index in range(field_data.GetNumberOfArrays()):
+                array = field_data.GetArray(array_index)
+                if array and array.GetName():
+                    num_comps = array.GetNumberOfComponents()
+                    component_values = [
+                        array.GetComponent(id_to_select, component_index)
+                        for component_index in range(num_comps)
+                    ]
+                    data_attributes[array.GetName()] = (
+                        component_values[0] if num_comps == 1 else component_values
                     )
-                    dataset = block if isinstance(block, vtkDataSet) else None
-                self.updateHoverHighlight(
-                    pipeline, id_to_select, params.field_type.value, dataset
-                )
-        self.render(-1)
+
+            if params.field_type == schemas.FieldType.POINT:
+                point_coordinates = data_obj.GetPoint(id_to_select)
+                if point_coordinates:
+                    data_attributes["coordinates"] = list(point_coordinates)
+
+        return {
+            "id": pipeline_id,
+            "picked_id": id_to_select,
+            "field_type": params.field_type.value,
+            "geode_id": geode_id,
+            "attributes": data_attributes,
+        }
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["set_z_scaling"]["rpc"])
     def setZScaling(self, rpc_params: RpcParams) -> None:

{opengeodeweb_viewer-1.19.0 → opengeodeweb_viewer-1.20.0}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -60,7 +60,7 @@ class VtkPipeline:
     mapper: vtkMapper
     filter: vtkAlgorithm | None = None
     actor: vtkActor = field(default_factory=vtkActor)
-    hoverHighlight: HighlightPipeline = field(default_factory=HighlightPipeline)
+    highlight: HighlightPipeline = field(default_factory=HighlightPipeline)
     blockDataSets: list[vtkDataObject | None] = field(default_factory=list)
     blockGeodeIds: list[str] = field(default_factory=list)
 
@@ -152,14 +152,14 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
         else:
             renderer.ResetCameraClippingRange()
 
-    def updateHoverHighlight(
+    def update_highlight(
         self,
         pipeline: VtkPipeline,
         id_to_select: int,
         field_type: str,
-        dataset: vtkDataSet | None = None,
+        dataset: vtkDataObject | None = None,
     ) -> None:
-        node = pipeline.hoverHighlight.selectionNode
+        node = pipeline.highlight.selectionNode
         node.SetContentType(vtkSelectionNode.INDICES)
         node.SetFieldType(
             vtkSelectionNode.CELL if field_type == "CELL" else vtkSelectionNode.POINT
@@ -169,15 +169,15 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
         selection_list.InsertNextValue(id_to_select)
         node.SetSelectionList(selection_list)
         if dataset is not None:
-            pipeline.hoverHighlight.extractSelection.SetInputData(0, dataset)
-        pipeline.hoverHighlight.extractSelection.Modified()
-        pipeline.hoverHighlight.extractSelection.Update()
-        pipeline.hoverHighlight.actor.VisibilityOn()
+            pipeline.highlight.extractSelection.SetInputData(0, dataset)
+        pipeline.highlight.extractSelection.Modified()
+        pipeline.highlight.extractSelection.Update()
+        pipeline.highlight.actor.VisibilityOn()
 
-    def clearHoverHighlights(self, ids: list[str]) -> None:
+    def clear_highlights(self, ids: list[str]) -> None:
         for data_id in ids:
             pipeline = self.get_vtk_pipeline(data_id)
-            pipeline.hoverHighlight.actor.VisibilityOff()
+            pipeline.highlight.actor.VisibilityOff()
 
     def update_grid_scale_and_clipping_range(self) -> None:
         grid_scale = self.get_grid_scale()