OpenGeodeWeb-Viewer 1.35.0rc2__tar.gz → 1.35.0rc3__tar.gz

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.35.0rc2
+Version: 1.35.0rc3
 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.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.35.0-rc.2"
+version = "1.35.0-rc.3"
 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.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.35.0rc2
+Version: 1.35.0rc3
 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.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/object/object_methods.py

@@ -63,8 +63,8 @@ class VtkObjectView(VtkView):
         for size_actor in pipeline.points_size_actors.values():
             renderer.RemoveActor(size_actor.actor)
         renderer.RemoveViewProp(pipeline.scalar_bar)
-        for bar in pipeline.scalar_bars.values():
-            renderer.RemoveViewProp(bar)
+        for scalar_bar in pipeline.scalar_bars.values():
+            renderer.RemoveViewProp(scalar_bar.actor)
         self.deregister_object(data_id)
         self.update_scalar_bars_layout()
 
@@ -74,8 +74,8 @@ class VtkObjectView(VtkView):
         self.set_points_actors_visibility(pipeline, visibility=visibility)
         if not visibility:
             pipeline.scalar_bar.VisibilityOff()
-            for bar in pipeline.scalar_bars.values():
-                bar.VisibilityOff()
+            for scalar_bar in pipeline.scalar_bars.values():
+                scalar_bar.actor.VisibilityOff()
             if pipeline.points_scalar_bar is not None:
                 pipeline.points_scalar_bar.VisibilityOff()
         else:
@@ -87,9 +87,9 @@ class VtkObjectView(VtkView):
             self.update_points_scalar_bar_visibility(pipeline)
             for style in pipeline.block_styles.values():
                 if style.get("name"):
-                    for bar in pipeline.scalar_bars.values():
-                        if bar.GetLookupTable() is not None:
-                            bar.VisibilityOn()
+                    for scalar_bar in pipeline.scalar_bars.values():
+                        if scalar_bar.actor.GetLookupTable() is not None:
+                            scalar_bar.actor.VisibilityOn()
                     break
         self.update_scalar_bars_layout()
 
@@ -234,8 +234,8 @@ class VtkObjectView(VtkView):
             pipeline.clear_blocks_scalars()
         mapper.ScalarVisibilityOff()
         pipeline.scalar_bar.VisibilityOff()
-        for bar in pipeline.scalar_bars.values():
-            bar.VisibilityOff()
+        for scalar_bar in pipeline.scalar_bars.values():
+            scalar_bar.actor.VisibilityOff()
         self.update_scalar_bars_layout()
 
     def _apply_highlight_style(self, actor: vtkActor, mapper: vtkDataSetMapper) -> None:

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -14,7 +14,6 @@ from vtkmodules.vtkCommonDataModel import (
 )
 from vtkmodules.vtkFiltersCore import vtkAppendDataSets
 from vtkmodules.vtkIOXML import vtkXMLMultiBlockDataReader
-from vtkmodules.vtkRenderingAnnotation import vtkScalarBarActor
 from vtkmodules.vtkRenderingCore import (
     vtkActor,
     vtkCompositeDataDisplayAttributes,
@@ -32,6 +31,7 @@ from opengeodeweb_viewer.utils_functions import (
 from opengeodeweb_viewer.vtk_pipeline import (
     BlockStyle,
     ModelPointsStyle,
+    ModelScalarBar,
     PointsSizeActor,
     VtkPipeline,
 )
@@ -122,46 +122,57 @@ class VtkModelView(VtkObjectView):
         self.setup_model_color_map(pipeline)
         return colors
 
+    @staticmethod
+    def scalar_bar_key(active_attrs: dict[str, BlockStyle], style: BlockStyle, label: str) -> str:
+        # Styles sharing the same color map share a scalar bar,
+        # the key only grows to tell them apart
+        name = style["name"]
+        item = style["item"]
+        minimum = style["minimum"]
+        maximum = style["maximum"]
+        points = style["points"]
+        attr_key = name
+        if attr_key in active_attrs and (
+            active_attrs[attr_key]["item"] != item
+            or active_attrs[attr_key]["minimum"] != minimum
+            or active_attrs[attr_key]["maximum"] != maximum
+            or active_attrs[attr_key]["points"] != points
+        ):
+            attr_key = f"{name} (Item {item + 1})" if item > 0 else name
+            if attr_key in active_attrs and (
+                active_attrs[attr_key]["minimum"] != minimum
+                or active_attrs[attr_key]["maximum"] != maximum
+                or active_attrs[attr_key]["points"] != points
+            ):
+                attr_key = f"{attr_key} [{minimum:g}, {maximum:g}]"
+                if attr_key in active_attrs and active_attrs[attr_key]["points"] != points:
+                    attr_key = f"{attr_key} (Block {label})"
+        return attr_key
+
     def setup_model_color_map(self, pipeline: VtkPipeline) -> None:
         # Points attributes join the polygons ones, so identical color maps share one scalar bar
         displayed_styles = [
-            (str(block_id), style) for block_id, style in pipeline.block_styles.items()
+            (block_id, str(block_id), style) for block_id, style in pipeline.block_styles.items()
         ] + [
-            (f"{block_id} points", points_style.attribute)
+            (block_id, f"{block_id} points", points_style.attribute)
             for block_id, points_style in pipeline.points_block_styles.items()
             if points_style.attribute is not None and points_style.visibility
         ]
         active_attrs: dict[str, BlockStyle] = {}
-        for block_id, style in displayed_styles:
+        active_block_ids: dict[str, list[int]] = {}
+        for block_id, label, style in displayed_styles:
             if style["name"]:
-                name = style["name"]
-                item = style["item"]
-                minimum = style["minimum"]
-                maximum = style["maximum"]
-                points = style["points"]
-                attr_key = name
-                if attr_key in active_attrs and (
-                    active_attrs[attr_key]["item"] != item
-                    or active_attrs[attr_key]["minimum"] != minimum
-                    or active_attrs[attr_key]["maximum"] != maximum
-                    or active_attrs[attr_key]["points"] != points
-                ):
-                    attr_key = f"{name} (Item {item + 1})" if item > 0 else name
-                    if attr_key in active_attrs and (
-                        active_attrs[attr_key]["minimum"] != minimum
-                        or active_attrs[attr_key]["maximum"] != maximum
-                        or active_attrs[attr_key]["points"] != points
-                    ):
-                        attr_key = f"{attr_key} [{minimum:g}, {maximum:g}]"
-                        if attr_key in active_attrs and active_attrs[attr_key]["points"] != points:
-                            attr_key = f"{attr_key} (Block {block_id})"
+                attr_key = self.scalar_bar_key(active_attrs, style, label)
                 active_attrs[attr_key] = style
+                bar_block_ids = active_block_ids.setdefault(attr_key, [])
+                if block_id not in bar_block_ids:
+                    bar_block_ids.append(block_id)
         for name, style in active_attrs.items():
             if name not in pipeline.scalar_bars:
-                bar = vtkScalarBarActor()
-                self.get_renderer().AddViewProp(bar)
-                pipeline.scalar_bars[name] = bar
-            bar = pipeline.scalar_bars[name]
+                pipeline.scalar_bars[name] = ModelScalarBar()
+                self.get_renderer().AddViewProp(pipeline.scalar_bars[name].actor)
+            pipeline.scalar_bars[name].block_ids = active_block_ids[name]
+            bar = pipeline.scalar_bars[name].actor
             item = style["item"]
             minimum = style["minimum"]
             maximum = style["maximum"]
@@ -170,9 +181,9 @@ class VtkModelView(VtkObjectView):
             lut = create_color_transfer_function(points, minimum, maximum, item, no_data_color)
             bar.SetLookupTable(lut)
             bar.VisibilityOn()
-        for name, bar in pipeline.scalar_bars.items():
+        for name, scalar_bar in pipeline.scalar_bars.items():
             if name not in active_attrs:
-                bar.VisibilityOff()
+                scalar_bar.actor.VisibilityOff()
 
         self.update_scalar_bars_layout()
 

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/rpc/viewer/schemas/pick_colormap.json

@@ -19,6 +19,12 @@
     "properties": {
       "data_id": {
         "type": "string"
+      },
+      "block_ids": {
+        "type": "array",
+        "items": {
+          "type": "integer"
+        }
       }
     },
     "required": [],

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/rpc/viewer/schemas/pick_colormap.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from opengeodeweb_microservice.schemas import Route, load_schema
-from typing import Optional
+from typing import List, Optional
 from dataclasses_json import DataClassJsonMixin
 from opengeodeweb_microservice.schemas import print_dataclass
 from dataclasses import dataclass
@@ -20,6 +20,7 @@ class PickColormapResponse(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print_dataclass(self)
 
+    block_ids: Optional[List[int]] = None
     data_id: Optional[str] = None
 
 

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -12,11 +12,12 @@ from vtkmodules.vtkInteractionWidgets import vtkOrientationMarkerWidget
 
 # Third party imports
 from vtkmodules.vtkIOImage import vtkJPEGWriter, vtkPNGWriter
-from vtkmodules.vtkRenderingAnnotation import vtkAxesActor, vtkCubeAxesActor
+from vtkmodules.vtkRenderingAnnotation import vtkAxesActor, vtkCubeAxesActor, vtkScalarBarActor
 from vtkmodules.vtkRenderingCore import (
     vtkAbstractMapper,
     vtkActor,
     vtkCellPicker,
+    vtkCompositePolyDataMapper,
     vtkDataSetMapper,
     vtkPropPicker,
     vtkRenderer,
@@ -210,18 +211,25 @@ class VtkViewerView(VtkView):
         ny = 1.0 - (params.y / size[1])
 
         for data_id, pipeline in self.get_data_base().items():
-            bar = pipeline.scalar_bar
-            if bar.GetVisibility() and bar.GetLookupTable() is not None:
-                pos = bar.GetPositionCoordinate()
-                bx, by = pos.GetValue()[0], pos.GetValue()[1]
-                w, h = bar.GetWidth(), bar.GetHeight()
-
-                # Check if click falls within the scalar bar bounding box
-                if bx <= nx <= bx + w and by <= ny <= by + h:
-                    return schemas.PickColormapResponse(data_id=data_id)
+            # A model has one scalar bar per attribute, each coloring some of its blocks
+            if isinstance(pipeline.mapper, vtkCompositePolyDataMapper):
+                for scalar_bar in pipeline.scalar_bars.values():
+                    if self.is_scalar_bar_clicked(scalar_bar.actor, nx, ny):
+                        return schemas.PickColormapResponse(
+                            data_id=data_id, block_ids=scalar_bar.block_ids
+                        )
+            elif self.is_scalar_bar_clicked(pipeline.scalar_bar, nx, ny):
+                return schemas.PickColormapResponse(data_id=data_id)
 
         return schemas.PickColormapResponse()
 
+    @staticmethod
+    def is_scalar_bar_clicked(bar: vtkScalarBarActor, nx: float, ny: float) -> bool:
+        if not bar.GetVisibility() or bar.GetLookupTable() is None:
+            return False
+        bx, by = bar.GetPositionCoordinate().GetValue()[:2]
+        return bool(bx <= nx <= bx + bar.GetWidth() and by <= ny <= by + bar.GetHeight())
+
     def compute_epsilon(self, renderer: vtkRenderer, z: float) -> float:
         renderer.SetDisplayPoint(0, 0, z)
         renderer.DisplayToWorld()

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/vtk_pipeline.py

@@ -209,6 +209,13 @@ class BlockStyle(TypedDict):
     no_data_color: ColorClassProtocol | None
 
 
+@dataclass
+class ModelScalarBar:
+    actor: vtkScalarBarActor = field(default_factory=vtkScalarBarActor)
+    # Blocks colored by this scalar bar
+    block_ids: list[int] = field(default_factory=list)
+
+
 @dataclass
 class PointsSizeActor:
     mapper: vtkCompositePolyDataMapper
@@ -239,7 +246,7 @@ class VtkPipeline:
     block_data_sets: list[vtkDataObject | None] = field(default_factory=list)
     block_geode_ids: list[str] = field(default_factory=list)
     scalar_bar: vtkScalarBarActor = field(default_factory=vtkScalarBarActor)
-    scalar_bars: dict[str, vtkScalarBarActor] = field(default_factory=dict)
+    scalar_bars: dict[str, ModelScalarBar] = field(default_factory=dict)
     block_styles: dict[int, BlockStyle] = field(default_factory=dict)
     pick_mapper: vtkMapper | None = None
     points_mapper: vtkDataSetMapper | None = None

{opengeodeweb_viewer-1.35.0rc2 → opengeodeweb_viewer-1.35.0rc3}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -530,9 +530,9 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
             points_attr_name = pipeline.points_mapper.GetArrayName()
             visible_bars.append((points_bar, points_attr_name, data_id, pipeline))
 
-        for attr_name, bar in pipeline.scalar_bars.items():
-            if bar.GetVisibility() and bar.GetLookupTable() is not None:
-                visible_bars.append((bar, attr_name, data_id, pipeline))
+        for attr_name, scalar_bar in pipeline.scalar_bars.items():
+            if scalar_bar.actor.GetVisibility() and scalar_bar.actor.GetLookupTable() is not None:
+                visible_bars.append((scalar_bar.actor, attr_name, data_id, pipeline))
         return visible_bars
 
     def update_scalar_bars_layout(self) -> None: