OpenGeodeWeb-Viewer 1.17.0rc2__tar.gz → 1.17.1rc2__tar.gz

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.17.0rc2
+Version: 1.17.1rc2
 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.12
+Requires-Dist: idna==3.13
 Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6
 Requires-Dist: numpy>=2
-Requires-Dist: packaging==26.1
+Requires-Dist: packaging==26.2
 Requires-Dist: pillow>=12
 Requires-Dist: propcache>=0
 Requires-Dist: pyparsing>=3
@@ -35,7 +35,7 @@ Requires-Dist: vtk==9.5.2
 Requires-Dist: websocket-client>=1
 Requires-Dist: wslink==1.12.4
 Requires-Dist: yarl>=1
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.2
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3rc1
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/pyproject.toml

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

@@ -22,7 +22,7 @@ frozenlist>=1
     # via
     #   aiohttp
     #   aiosignal
-idna==3.12
+idna==3.13
     # via yarl
 kiwisolver>=1
     # via matplotlib
@@ -36,7 +36,7 @@ numpy>=2
     # via
     #   contourpy
     #   matplotlib
-packaging==26.1
+packaging==26.2
     # via matplotlib
 pillow>=12
     # via matplotlib
@@ -61,4 +61,4 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.1.2
+opengeodeweb-microservice==1.*,>=1.1.3rc1

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.17.0rc2
+Version: 1.17.1rc2
 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.12
+Requires-Dist: idna==3.13
 Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6
 Requires-Dist: numpy>=2
-Requires-Dist: packaging==26.1
+Requires-Dist: packaging==26.2
 Requires-Dist: pillow>=12
 Requires-Dist: propcache>=0
 Requires-Dist: pyparsing>=3
@@ -35,7 +35,7 @@ Requires-Dist: vtk==9.5.2
 Requires-Dist: websocket-client>=1
 Requires-Dist: wslink==1.12.4
 Requires-Dist: yarl>=1
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.2
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3rc1
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/OpenGeodeWeb_Viewer.egg-info/SOURCES.txt

@@ -124,6 +124,8 @@ src/opengeodeweb_viewer/rpc/mesh/schemas/color.json
 src/opengeodeweb_viewer/rpc/mesh/schemas/color.py
 src/opengeodeweb_viewer/rpc/mesh/schemas/deregister.json
 src/opengeodeweb_viewer/rpc/mesh/schemas/deregister.py
+src/opengeodeweb_viewer/rpc/mesh/schemas/highlight.json
+src/opengeodeweb_viewer/rpc/mesh/schemas/highlight.py
 src/opengeodeweb_viewer/rpc/mesh/schemas/register.json
 src/opengeodeweb_viewer/rpc/mesh/schemas/register.py
 src/opengeodeweb_viewer/rpc/mesh/schemas/visibility.json
@@ -160,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/highlight.json
+src/opengeodeweb_viewer/rpc/model/schemas/highlight.py
 src/opengeodeweb_viewer/rpc/model/schemas/register.json
 src/opengeodeweb_viewer/rpc/model/schemas/register.py
 src/opengeodeweb_viewer/rpc/model/schemas/visibility.json

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/OpenGeodeWeb_Viewer.egg-info/requires.txt

@@ -6,12 +6,12 @@ contourpy>=1
 cycler>=0
 fonttools>=4
 frozenlist>=1
-idna==3.12
+idna==3.13
 kiwisolver>=1
 matplotlib>=3
 multidict>=6
 numpy>=2
-packaging==26.1
+packaging==26.2
 pillow>=12
 propcache>=0
 pyparsing>=3
@@ -22,4 +22,4 @@ vtk==9.5.2
 websocket-client>=1
 wslink==1.12.4
 yarl>=1
-opengeodeweb-microservice==1.*,>=1.1.2
+opengeodeweb-microservice==1.*,>=1.1.3rc1

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/opengeodeweb_viewer/object/object_methods.py

@@ -9,8 +9,13 @@ from vtkmodules.vtkRenderingCore import (
     vtkActor,
     vtkTexture,
     vtkCompositePolyDataMapper,
+    vtkCompositeDataDisplayAttributes,
+    vtkDataSetMapper,
+)
+from vtkmodules.vtkCommonDataModel import (
+    vtkDataObject,
+    vtkDataSet,
 )
-from vtkmodules.vtkCommonDataModel import vtkDataObject, vtkDataSet
 
 # Local application imports
 from opengeodeweb_viewer.vtk_protocol import VtkView, VtkPipeline
@@ -42,14 +47,16 @@ class VtkObjectView(VtkView):
             if actor.visibility == True:
                 resetCamara = False
         renderer.AddActor(data.actor)
+        renderer.AddActor(data.highlightActor)
         if resetCamara:
             renderer.ResetCamera()
 
     def deregisterObject(self, data_id: str) -> None:
-        actor = self.get_vtk_pipeline(data_id).actor
+        pipeline = self.get_vtk_pipeline(data_id)
         renderWindow = self.getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
-        renderer.RemoveActor(actor)
+        renderer.RemoveActor(pipeline.actor)
+        renderer.RemoveActor(pipeline.highlightActor)
         self.deregister_object(data_id)
 
     def SetVisibility(self, data_id: str, visibility: bool) -> None:
@@ -154,3 +161,17 @@ class VtkObjectView(VtkView):
             output.GetPointData().SetActiveScalars("")
             output.GetCellData().SetActiveScalars("")
         mapper.ScalarVisibilityOff()
+
+    def highlight(
+        self, actor: vtkActor, mapper: vtkMapper, input_dataset: vtkDataObject
+    ) -> None:
+        mapper.SetInputDataObject(input_dataset)
+        mapper.ScalarVisibilityOff()
+        prop = actor.GetProperty()
+        prop.SetColor(0.235, 0.6, 0.514)
+        prop.SetLineWidth(5)
+        prop.SetPointSize(14)
+        prop.SetRenderPointsAsSpheres(True)
+        prop.SetLighting(False)
+        actor.SetMapper(mapper)
+        actor.VisibilityOff()

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -50,7 +50,11 @@ class VtkMeshView(VtkObjectView):
             reader.Update()
             mapper = vtkDataSetMapper()
             mapper.SetInputConnection(reader.GetOutputPort())
-            data = VtkPipeline(reader, mapper)
+            highlight_mapper = vtkDataSetMapper()
+            data = VtkPipeline(reader, highlight_mapper, mapper)
+            self.highlight(
+                data.highlightActor, data.highlightMapper, reader.GetOutputDataObject(0)
+            )
             self.registerObject(data_id, file_name, data)
         except Exception as e:
             print(f"Error registering mesh {data_id}: {str(e)}", flush=True)
@@ -165,3 +169,13 @@ class VtkMeshView(VtkObjectView):
         lut.SetRange(minimum, maximum)
         data.mapper.SetUseLookupTableScalarRange(False)
         data.mapper.InterpolateScalarsBeforeMappingOn()
+
+    @exportRpc(mesh_prefix + mesh_schemas_dict["highlight"]["rpc"])
+    def setMeshhighlight(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params, self.mesh_schemas_dict["highlight"], self.mesh_prefix
+        )
+        params = schemas.Highlight.from_dict(rpc_params)
+        pipeline = self.get_vtk_pipeline(params.id)
+        pipeline.highlightActor.SetVisibility(params.visibility)
+        self.render(-1)

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/opengeodeweb_viewer/rpc/mesh/schemas/__init__.py

@@ -1,5 +1,6 @@
 from .visibility import *
 from .register import *
+from .highlight import *
 from .deregister import *
 from .color import *
 from .apply_textures import *

opengeodeweb_viewer-1.17.1rc2/src/opengeodeweb_viewer/rpc/mesh/schemas/highlight.json

@@ -0,0 +1,15 @@
+{
+  "rpc": "highlight",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "visibility": {
+      "type": "boolean"
+    }
+  },
+  "required": ["id", "visibility"],
+  "additionalProperties": false
+}

opengeodeweb_viewer-1.17.1rc2/src/opengeodeweb_viewer/rpc/mesh/schemas/highlight.py

@@ -0,0 +1,11 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Highlight(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    id: str
+    visibility: bool

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -118,7 +118,12 @@ class VtkModelView(VtkObjectView):
             mapper.SetInputDataObject(geometry_output)
             attributes = vtkCompositeDataDisplayAttributes()
             mapper.SetCompositeDataDisplayAttributes(attributes)
-            data = VtkPipeline(reader, mapper, filter)
+            highlight_mapper = vtkCompositePolyDataMapper()
+            highlight_mapper.SetCompositeDataDisplayAttributes(
+                vtkCompositeDataDisplayAttributes()
+            )
+            data = VtkPipeline(reader, highlight_mapper, mapper, filter)
+            self.highlight(data.highlightActor, data.highlightMapper, geometry_output)
             iterator = geometry_output.NewTreeIterator()
             iterator.InitTraversal()
             while not iterator.IsDoneWithTraversal():
@@ -129,6 +134,9 @@ class VtkModelView(VtkObjectView):
                         data.blockDataSets.append(None)
                         data.blockGeodeIds.append("")
                     data.blockDataSets.append(block)
+                    highlight_mapper.GetCompositeDataDisplayAttributes().SetBlockVisibility(
+                        block, False
+                    )
                     meta = iterator.GetCurrentMetaData()
                     name = meta.Get(vtkCompositeDataSet.NAME())
                     data.blockGeodeIds.append(name)
@@ -153,3 +161,29 @@ class VtkModelView(VtkObjectView):
         )
         params = schemas.Visibility.from_dict(rpc_params)
         self.SetVisibility(params.id, params.visibility)
+
+    @exportRpc(model_prefix + model_schemas_dict["highlight"]["rpc"])
+    def setModelhighlight(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params, self.model_schemas_dict["highlight"], self.model_prefix
+        )
+        params = schemas.Highlight.from_dict(rpc_params)
+        pipeline = self.get_vtk_pipeline(params.id)
+        pipeline.highlightActor.SetVisibility(params.visibility)
+        mapper = pipeline.highlightMapper
+        assert isinstance(mapper, vtkCompositePolyDataMapper)
+        attributes = mapper.GetCompositeDataDisplayAttributes()
+
+        for i in pipeline.activeHighlightIds:
+            attributes.SetBlockVisibility(pipeline.blockDataSets[i], False)
+
+        pipeline.activeHighlightIds = []
+        if params.visibility:
+            pipeline.activeHighlightIds = [
+                i for i in params.block_ids if pipeline.blockDataSets[i]
+            ]
+            for i in pipeline.activeHighlightIds:
+                attributes.SetBlockVisibility(pipeline.blockDataSets[i], True)
+
+        mapper.Modified()
+        self.render(-1)

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/opengeodeweb_viewer/rpc/model/schemas/__init__.py

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

opengeodeweb_viewer-1.17.1rc2/src/opengeodeweb_viewer/rpc/model/schemas/highlight.json

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

opengeodeweb_viewer-1.17.1rc2/src/opengeodeweb_viewer/rpc/model/schemas/highlight.py

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

{opengeodeweb_viewer-1.17.0rc2 → opengeodeweb_viewer-1.17.1rc2}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -1,4 +1,5 @@
 # Standard library imports
+import math
 import os
 from typing import cast, Any, Literal
 from dataclasses import dataclass, field
@@ -19,6 +20,7 @@ from vtkmodules.vtkRenderingCore import (
     vtkCompositePolyDataMapper,
 )
 from vtkmodules.vtkCommonDataModel import vtkDataObject, vtkBoundingBox
+from vtkmodules.vtkCommonCore import vtkStringArray
 from vtkmodules.vtkRenderingAnnotation import vtkCubeAxesActor, vtkAxesActor
 from vtkmodules.vtkInteractionWidgets import vtkOrientationMarkerWidget
 
@@ -39,11 +41,14 @@ class ViewerData:
 @dataclass
 class VtkPipeline:
     reader: vtkXMLReader
+    highlightMapper: vtkMapper
     mapper: vtkMapper
     filter: vtkAlgorithm | None = None
     actor: vtkActor = field(default_factory=vtkActor)
+    highlightActor: vtkActor = field(default_factory=vtkActor)
     blockDataSets: list[vtkDataObject | None] = field(default_factory=list)
     blockGeodeIds: list[str] = field(default_factory=list)
+    activeHighlightIds: list[int] = field(default_factory=list)
 
 
 class VtkTypingMixin:
@@ -149,6 +154,62 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
                 final_bounds = [0.0] * 6
                 bounds.GetBounds(final_bounds)
                 grid_scale.SetBounds(final_bounds)
+
+                def get_dist(axis: int) -> float:
+                    p1 = [final_bounds[0], final_bounds[2], final_bounds[4]]
+                    p2 = list(p1)
+                    p2[axis] = final_bounds[axis * 2 + 1]
+                    renderer.SetWorldPoint(p1[0], p1[1], p1[2], 1.0)
+                    renderer.WorldToDisplay()
+                    d1 = list(renderer.GetDisplayPoint())
+                    renderer.SetWorldPoint(p2[0], p2[1], p2[2], 1.0)
+                    renderer.WorldToDisplay()
+                    d2 = list(renderer.GetDisplayPoint())
+                    return math.sqrt((d1[0] - d2[0]) ** 2 + (d1[1] - d2[1]) ** 2)
+
+                visibility_setters = [
+                    grid_scale.SetXAxisLabelVisibility,
+                    grid_scale.SetYAxisLabelVisibility,
+                    grid_scale.SetZAxisLabelVisibility,
+                ]
+
+                for axis in range(3):
+                    dist = get_dist(axis)
+                    visibility_setter = visibility_setters[axis]
+
+                    v1 = f"{final_bounds[axis * 2]:g}"
+                    v2 = f"{final_bounds[axis * 2 + 1]:g}"
+                    v_mid = (
+                        f"{(final_bounds[axis * 2] + final_bounds[axis * 2 + 1]) / 2:g}"
+                    )
+
+                    char_width = 8
+                    len1 = len(v1) * char_width
+                    len2 = len(v2) * char_width
+                    len_mid = len(v_mid) * char_width
+
+                    hide_threshold = max(len1, len2) + 15
+                    two_labels_threshold = (len1 + len2) * 1.1 + 30
+                    three_labels_threshold = (len1 + len2 + len_mid) * 1.2 + 45
+
+                    if dist < hide_threshold:
+                        visibility_setter(False)
+                    elif dist < two_labels_threshold:
+                        visibility_setter(True)
+                        labels = vtkStringArray()
+                        labels.InsertNextValue(v1)
+                        labels.InsertNextValue(v2)
+                        grid_scale.SetAxisLabels(axis, labels)
+                    elif dist < three_labels_threshold:
+                        visibility_setter(True)
+                        labels = vtkStringArray()
+                        labels.InsertNextValue(v1)
+                        labels.InsertNextValue(v_mid)
+                        labels.InsertNextValue(v2)
+                        grid_scale.SetAxisLabels(axis, labels)
+                    else:
+                        visibility_setter(True)
+                        grid_scale.SetAxisLabels(axis, None)
         self.reset_camera_clipping_range()
 
     def render(self, view: int = -1) -> None: