OpenGeodeWeb-Viewer 1.25.0rc4__tar.gz → 1.25.1__tar.gz

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.25.0rc4
+Version: 1.25.1
 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,12 +19,12 @@ Requires-Dist: contourpy>=1
 Requires-Dist: cycler>=0
 Requires-Dist: fonttools>=4
 Requires-Dist: frozenlist>=1
-Requires-Dist: idna==3.18
+Requires-Dist: idna>=3
 Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6
 Requires-Dist: numpy>=2
-Requires-Dist: packaging==26.3
+Requires-Dist: packaging>=26
 Requires-Dist: pillow>=12
 Requires-Dist: propcache>=0
 Requires-Dist: pyparsing>=3
@@ -32,10 +32,10 @@ Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: six>=1
 Requires-Dist: typing-extensions>=4
 Requires-Dist: vtk==9.5.2
-Requires-Dist: websocket-client>=1
+Requires-Dist: websocket-client==1.8.0
 Requires-Dist: wslink==1.12.4
 Requires-Dist: yarl>=1
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0rc2
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.25.0-rc.4"
+version = "1.25.1"
 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.0rc4 → opengeodeweb_viewer-1.25.1}/requirements.txt

@@ -22,7 +22,7 @@ frozenlist>=1
     # via
     #   aiohttp
     #   aiosignal
-idna==3.18
+idna>=3
     # via yarl
 kiwisolver>=1
     # via matplotlib
@@ -36,7 +36,7 @@ numpy>=2
     # via
     #   contourpy
     #   matplotlib
-packaging==26.3
+packaging>=26
     # via matplotlib
 pillow>=12
     # via matplotlib
@@ -56,11 +56,11 @@ typing-extensions>=4
     #   aiosignal
 vtk==9.5.2
     # via -r requirements.in
-websocket-client>=1
+websocket-client==1.8.0
     # via -r requirements.in
 wslink==1.12.4
     # via -r requirements.in
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.2.0rc2
+opengeodeweb-microservice==1.*,>=1.2.0

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.25.0rc4
+Version: 1.25.1
 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,12 +19,12 @@ Requires-Dist: contourpy>=1
 Requires-Dist: cycler>=0
 Requires-Dist: fonttools>=4
 Requires-Dist: frozenlist>=1
-Requires-Dist: idna==3.18
+Requires-Dist: idna>=3
 Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6
 Requires-Dist: numpy>=2
-Requires-Dist: packaging==26.3
+Requires-Dist: packaging>=26
 Requires-Dist: pillow>=12
 Requires-Dist: propcache>=0
 Requires-Dist: pyparsing>=3
@@ -32,10 +32,10 @@ Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: six>=1
 Requires-Dist: typing-extensions>=4
 Requires-Dist: vtk==9.5.2
-Requires-Dist: websocket-client>=1
+Requires-Dist: websocket-client==1.8.0
 Requires-Dist: wslink==1.12.4
 Requires-Dist: yarl>=1
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0rc2
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/OpenGeodeWeb_Viewer.egg-info/requires.txt

@@ -6,12 +6,12 @@ contourpy>=1
 cycler>=0
 fonttools>=4
 frozenlist>=1
-idna==3.18
+idna>=3
 kiwisolver>=1
 matplotlib>=3
 multidict>=6
 numpy>=2
-packaging==26.3
+packaging>=26
 pillow>=12
 propcache>=0
 pyparsing>=3
@@ -19,7 +19,7 @@ python-dateutil==2.9.0.post0
 six>=1
 typing-extensions>=4
 vtk==9.5.2
-websocket-client>=1
+websocket-client==1.8.0
 wslink==1.12.4
 yarl>=1
-opengeodeweb-microservice==1.*,>=1.2.0rc2
+opengeodeweb-microservice==1.*,>=1.2.0

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/opengeodeweb_viewer/object/object_methods.py

@@ -53,6 +53,8 @@ class VtkObjectView(VtkView):
         renderer.RemoveActor(pipeline.actor)
         renderer.RemoveActor(pipeline.highlight.actor)
         renderer.RemoveActor2D(pipeline.scalarBar)
+        for bar in pipeline.scalar_bars.values():
+            renderer.RemoveActor2D(bar)
         self.deregister_object(data_id)
         self.update_scalar_bars_layout()
 
@@ -61,12 +63,20 @@ class VtkObjectView(VtkView):
         pipeline.actor.SetVisibility(visibility)
         if not visibility:
             pipeline.scalarBar.SetVisibility(False)
+            for bar in pipeline.scalar_bars.values():
+                bar.SetVisibility(False)
         else:
             if (
                 pipeline.mapper.GetScalarVisibility()
                 and pipeline.mapper.GetLookupTable() is not None
             ):
                 pipeline.scalarBar.SetVisibility(True)
+            for style in pipeline.block_styles.values():
+                if style and style.get("name"):
+                    for bar in pipeline.scalar_bars.values():
+                        if bar.GetLookupTable() is not None:
+                            bar.SetVisibility(True)
+                    break
         self.update_scalar_bars_layout()
 
     def SetOpacity(self, data_id: str, opacity: float) -> None:
@@ -176,8 +186,16 @@ class VtkObjectView(VtkView):
         if isinstance(output, vtkDataSet):
             output.GetPointData().SetActiveScalars("")
             output.GetCellData().SetActiveScalars("")
+        elif isinstance(mapper, vtkCompositePolyDataMapper):
+            pipeline.block_styles.clear()
+            for block in pipeline.blockDataSets:
+                if isinstance(block, vtkDataSet):
+                    block.GetPointData().SetActiveScalars("")
+                    block.GetCellData().SetActiveScalars("")
         mapper.ScalarVisibilityOff()
         pipeline.scalarBar.SetVisibility(False)
+        for bar in pipeline.scalar_bars.values():
+            bar.SetVisibility(False)
         self.update_scalar_bars_layout()
 
     def _apply_highlight_style(self, actor: vtkActor, mapper: vtkDataSetMapper) -> None:

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -15,6 +15,7 @@ from wslink import register as exportRpc  # type: ignore
 # Local application imports
 from opengeodeweb_viewer.object.object_methods import VtkObjectView
 from opengeodeweb_viewer.utils_functions import (
+    create_color_transfer_function,
     RpcParams,
     validate_schema,
 )
@@ -165,28 +166,9 @@ class VtkMeshView(VtkObjectView):
         item: int = 0,
     ) -> None:
         data = self.get_vtk_pipeline(data_id)
-        lut = vtkColorTransferFunction()
-        lut.SetVectorModeToComponent()
-        lut.SetVectorComponent(item)
+        lut = create_color_transfer_function(points, minimum, maximum, item)
         data.mapper.SetLookupTable(lut)
 
-        if not points:
-            lut.AddRGBPoint(minimum, 0, 0, 0)
-            lut.AddRGBPoint(maximum, 1, 1, 1)
-        else:
-            x_values = points[::4]
-            x_min = min(x_values)
-            x_max = max(x_values)
-            x_range = x_max - x_min
-            target_range = maximum - minimum
-
-            for x, r, g, b in zip(*[iter(points)] * 4):
-                if x_range != 0:
-                    new_x = minimum + (x - x_min) / x_range * target_range
-                else:
-                    new_x = minimum
-                lut.AddRGBPoint(new_x, r, g, b)
-
         data.mapper.SetScalarRange(minimum, maximum)
         lut.SetRange(minimum, maximum)
         data.mapper.SetUseLookupTableScalarRange(False)

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -12,7 +12,9 @@ from vtkmodules.vtkCommonDataModel import (
 from vtkmodules.vtkCommonDataModel import vtkMultiBlockDataSet
 from vtkmodules.vtkFiltersCore import vtkAppendDataSets
 from vtkmodules.vtkIOXML import vtkXMLMultiBlockDataReader
+from vtkmodules.vtkRenderingAnnotation import vtkScalarBarActor
 from vtkmodules.vtkRenderingCore import (
+    vtkColorTransferFunction,
     vtkCompositeDataDisplayAttributes,
     vtkCompositePolyDataMapper,
 )
@@ -21,11 +23,12 @@ from wslink import register as exportRpc  # type: ignore
 # Local application imports
 from opengeodeweb_viewer.object.object_methods import VtkObjectView
 from opengeodeweb_viewer.utils_functions import (
+    create_color_transfer_function,
     deterministic_color,
     RpcParams,
     validate_schema,
 )
-from opengeodeweb_viewer.vtk_pipeline import VtkPipeline
+from opengeodeweb_viewer.vtk_pipeline import BlockStyle, VtkPipeline
 from . import schemas
 
 
@@ -104,8 +107,57 @@ class VtkModelView(VtkObjectView):
                     attr.SetBlockColor(block_dataset, [red, green, blue])
                     attr.SetBlockOpacity(block_dataset, alpha)
         mapper.Modified()
+        self.setup_model_color_map(pipeline)
         return colors
 
+    def setup_model_color_map(self, pipeline: VtkPipeline) -> None:
+        active_attrs: dict[str, BlockStyle] = {}
+        for block_id, style in pipeline.block_styles.items():
+            if style and 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})"
+                active_attrs[attr_key] = style
+        for name, style in active_attrs.items():
+            if name not in pipeline.scalar_bars:
+                bar = vtkScalarBarActor()
+                self.get_renderer().AddActor2D(bar)
+                pipeline.scalar_bars[name] = bar
+            bar = pipeline.scalar_bars[name]
+            item = style["item"]
+            minimum = style["minimum"]
+            maximum = style["maximum"]
+            points = style["points"]
+            lut = create_color_transfer_function(points, minimum, maximum, item)
+            bar.SetLookupTable(lut)
+            bar.SetVisibility(True)
+        for name, bar in pipeline.scalar_bars.items():
+            if name not in active_attrs:
+                bar.SetVisibility(False)
+
+        self.update_scalar_bars_layout()
+
     def displayAttributeOnVertices(
         self,
         data_id: str,
@@ -126,6 +178,7 @@ class VtkModelView(VtkObjectView):
             style["minimum"] = minimum
             style["maximum"] = maximum
             pipeline.update_block_colors(block_id)
+        self.setup_model_color_map(pipeline)
 
     def displayAttributeOnCells(
         self,
@@ -147,6 +200,7 @@ class VtkModelView(VtkObjectView):
             style["minimum"] = minimum
             style["maximum"] = maximum
             pipeline.update_block_colors(block_id)
+        self.setup_model_color_map(pipeline)
 
     def setupColorMap(
         self,
@@ -162,6 +216,7 @@ class VtkModelView(VtkObjectView):
             style["minimum"] = minimum
             style["maximum"] = maximum
             pipeline.update_block_colors(block_id)
+        self.setup_model_color_map(pipeline)
 
     @exportRpc(model_prefix + model_schemas_dict["register"]["rpc"])
     def registerModel(self, rpc_params: RpcParams) -> None:

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/opengeodeweb_viewer/utils_functions.py

@@ -3,6 +3,7 @@
 # Third party imports
 import fastjsonschema  # type: ignore
 import math
+from vtkmodules.vtkRenderingCore import vtkColorTransferFunction
 
 from opengeodeweb_microservice.schemas import SchemaDict
 
@@ -55,3 +56,25 @@ def deterministic_color(identifier: str) -> tuple[float, float, float]:
         return round(255 * intensity) / 255
 
     return (component(0), component(PHASE_GREEN), component(4))
+
+
+def create_color_transfer_function(
+    points: list[float], minimum: float, maximum: float, item: int = 0
+) -> vtkColorTransferFunction:
+    lut = vtkColorTransferFunction()
+    lut.SetVectorModeToComponent()
+    lut.SetVectorComponent(item)
+    lut.SetRange(minimum, maximum)
+    if points:
+        x_min, x_max = points[0], points[-4]
+        span = x_max - x_min
+        for i in range(0, len(points), 4):
+            x, r, g, b = points[i : i + 4]
+            new_x = (
+                minimum + (x - x_min) / span * (maximum - minimum) if span else minimum
+            )
+            lut.AddRGBPoint(new_x, r, g, b)
+    else:
+        lut.AddRGBPoint(minimum, 0, 0, 0)
+        lut.AddRGBPoint(maximum, 1, 1, 1)
+    return lut

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/opengeodeweb_viewer/vtk_pipeline.py

@@ -34,6 +34,7 @@ from opengeodeweb_microservice.database.data_types import (
     ViewerElementsType,
     ViewerType,
 )
+from opengeodeweb_viewer.utils_functions import create_color_transfer_function
 
 
 @dataclass
@@ -73,6 +74,7 @@ class VtkPipeline:
     blockDataSets: list[vtkDataObject | None] = field(default_factory=list)
     blockGeodeIds: list[str] = field(default_factory=list)
     scalarBar: vtkScalarBarActor = field(default_factory=vtkScalarBarActor)
+    scalar_bars: dict[str, vtkScalarBarActor] = field(default_factory=dict)
     block_styles: dict[int, BlockStyle] = field(default_factory=dict)
     pick_mapper: vtkMapper | None = None
 
@@ -139,50 +141,24 @@ class VtkPipeline:
         is_point = style["attribute_location"] == "point"
         field_data = block.GetPointData() if is_point else block.GetCellData()
         other_field_data = block.GetCellData() if is_point else block.GetPointData()
-
         scalar_array = field_data.GetArray(style["name"])
         if not scalar_array:
             return
-
-        field_data.SetActiveScalars(style["name"])
-        other_field_data.SetActiveScalars("")
-
         item = style.get("item", 0)
-        minimum = style["minimum"]
-        maximum = style["maximum"]
-        points = style["points"]
-        lut = vtkColorTransferFunction()
-        lut.SetVectorModeToComponent()
-        lut.SetVectorComponent(item)
-        lut.SetRange(minimum, maximum)
-        if points:
-            x_min, x_max = points[0], points[-4]
-            span = x_max - x_min
-            for i in range(0, len(points), 4):
-                x, r, g, b = points[i : i + 4]
-                new_x = (
-                    minimum + (x - x_min) / span * (maximum - minimum)
-                    if span
-                    else minimum
-                )
-                lut.AddRGBPoint(new_x, r, g, b)
-        else:
-            lut.AddRGBPoint(minimum, 0, 0, 0)
-            lut.AddRGBPoint(maximum, 1, 1, 1)
-
+        lut = create_color_transfer_function(
+            style["points"], style["minimum"], style["maximum"], item
+        )
+        rgba_colors = lut.MapScalars(scalar_array, 1, item)
+        rgba_colors.SetName(f"__colors_{style['name']}")
+        field_data.AddArray(rgba_colors)
+        field_data.SetActiveScalars(rgba_colors.GetName())
+        other_field_data.SetActiveScalars("")
         if isinstance(self.mapper, vtkCompositePolyDataMapper):
             if attributes := self.mapper.GetCompositeDataDisplayAttributes():
                 attributes.RemoveBlockColor(block)
         self.mapper.ScalarVisibilityOn()
-        self.mapper.SetLookupTable(lut)
-        self.mapper.SetScalarRange(minimum, maximum)
-        self.mapper.SetColorModeToMapScalars()
-        if is_point:
-            self.mapper.SetScalarModeToUsePointData()
-        else:
-            self.mapper.SetScalarModeToUseCellData()
-        self.mapper.ColorByArrayComponent(style["name"], item)
-        self.mapper.InterpolateScalarsBeforeMappingOn()
+        self.mapper.SetColorModeToDirectScalars()
+        self.mapper.SetScalarModeToDefault()
         self.mapper.Modified()
 
     def sync_block_display_attributes(

{opengeodeweb_viewer-1.25.0rc4 → opengeodeweb_viewer-1.25.1}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from vtkmodules.vtkRenderingAnnotation import vtkScalarBarActor
 import math
 import os
 from typing import Any, cast
@@ -389,12 +390,26 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
         self.reset_camera_clipping_range()
 
     def update_scalar_bars_layout(self) -> None:
-        visible_bars = [
-            (data_id, pipeline)
-            for data_id, pipeline in self.get_data_base().items()
-            if pipeline.scalarBar.GetVisibility()
-            and pipeline.scalarBar.GetLookupTable() is not None
-        ]
+        visible_bars: list[tuple[vtkScalarBarActor, str, str, VtkPipeline]] = []
+        for data_id, pipeline in self.get_data_base().items():
+            if (
+                pipeline.scalarBar.GetVisibility()
+                and pipeline.scalarBar.GetLookupTable() is not None
+            ):
+                dataset = pipeline.filter.GetOutputDataObject(0)
+                scalars = (
+                    dataset.GetPointData().GetScalars()
+                    or dataset.GetCellData().GetScalars()
+                    if isinstance(dataset, vtkDataSet)
+                    else None
+                )
+                attr_name = scalars.GetName() if scalars else "Attribute"
+                visible_bars.append((pipeline.scalarBar, 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))
+
         if not visible_bars:
             return
 
@@ -407,16 +422,8 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
         actual_width = 0.10
         row_height = 0.12
 
-        for i, (data_id, pipeline) in enumerate(visible_bars):
-            bar = pipeline.scalarBar
+        for i, (bar, attr_name, data_id, pipeline) in enumerate(visible_bars):
             dataset = pipeline.filter.GetOutputDataObject(0)
-            scalars = (
-                dataset.GetPointData().GetScalars()
-                or dataset.GetCellData().GetScalars()
-                if dataset
-                else None
-            )
-            attr_name = scalars.GetName() if scalars else "Attribute"
             data_name = (
                 dataset.GetObjectName()
                 if dataset and dataset.GetObjectName()