OpenGeodeWeb-Viewer 1.14.0rc2__tar.gz → 1.15.0__tar.gz

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.14.0rc2
+Version: 1.15.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
@@ -24,7 +24,7 @@ Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6
 Requires-Dist: numpy>=2
-Requires-Dist: packaging==25.0
+Requires-Dist: packaging==26.0
 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.0.12
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.13rc1
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/pyproject.toml

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

@@ -36,7 +36,7 @@ numpy>=2
     # via
     #   contourpy
     #   matplotlib
-packaging==25.0
+packaging==26.0
     # via matplotlib
 pillow>=12
     # via matplotlib
@@ -61,4 +61,4 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.0.12
+opengeodeweb-microservice==1.*,>=1.0.13rc1

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.14.0rc2
+Version: 1.15.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
@@ -24,7 +24,7 @@ Requires-Dist: kiwisolver>=1
 Requires-Dist: matplotlib>=3
 Requires-Dist: multidict>=6
 Requires-Dist: numpy>=2
-Requires-Dist: packaging==25.0
+Requires-Dist: packaging==26.0
 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.0.12
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.13rc1
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/OpenGeodeWeb_Viewer.egg-info/SOURCES.txt

@@ -45,8 +45,8 @@ src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py
 src/opengeodeweb_viewer/rpc/mesh/edges/schemas/__init__.py
 src/opengeodeweb_viewer/rpc/mesh/edges/schemas/color.json
 src/opengeodeweb_viewer/rpc/mesh/edges/schemas/color.py
-src/opengeodeweb_viewer/rpc/mesh/edges/schemas/size.json
-src/opengeodeweb_viewer/rpc/mesh/edges/schemas/size.py
+src/opengeodeweb_viewer/rpc/mesh/edges/schemas/edge_attribute.json
+src/opengeodeweb_viewer/rpc/mesh/edges/schemas/edge_attribute.py
 src/opengeodeweb_viewer/rpc/mesh/edges/schemas/vertex_attribute.json
 src/opengeodeweb_viewer/rpc/mesh/edges/schemas/vertex_attribute.py
 src/opengeodeweb_viewer/rpc/mesh/edges/schemas/vertex_color_map.json

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/OpenGeodeWeb_Viewer.egg-info/requires.txt

@@ -11,7 +11,7 @@ kiwisolver>=1
 matplotlib>=3
 multidict>=6
 numpy>=2
-packaging==25.0
+packaging==26.0
 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.0.12
+opengeodeweb-microservice==1.*,>=1.0.13rc1

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/opengeodeweb_viewer/object/object_methods.py

@@ -77,7 +77,11 @@ class VtkObjectView(VtkView):
 
     def SetEdgesWidth(self, data_id: str, width: float) -> None:
         actor = self.get_object(data_id).actor
-        actor.GetProperty().SetEdgeWidth(width)
+        max_dimension = self.get_object(data_id).max_dimension
+        if max_dimension == "edges":
+            actor.GetProperty().SetLineWidth(width)
+        else:
+            actor.GetProperty().SetEdgeWidth(width)
 
     def SetEdgesColor(self, data_id: str, red: int, green: int, blue: int) -> None:
         actor = self.get_object(data_id).actor

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/opengeodeweb_viewer/rpc/mesh/edges/mesh_edges_protocols.py

@@ -81,3 +81,13 @@ class VtkMeshEdgesView(VtkMeshView):
         )
         params = schemas.VertexColorMap.from_dict(rpc_params)
         self.setupColorMap(params.id, params.points)
+
+    @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["edge_attribute"]["rpc"])
+    def setMeshEdgesEdgeAttribute(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params,
+            self.mesh_edges_schemas_dict["edge_attribute"],
+            self.mesh_edges_prefix,
+        )
+        params = schemas.EdgeAttribute.from_dict(rpc_params)
+        self.displayAttributeOnCells(params.id, params.name)

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/__init__.py

@@ -3,5 +3,5 @@ from .visibility import *
 from .vertex_scalar_range import *
 from .vertex_color_map import *
 from .vertex_attribute import *
-from .size import *
+from .edge_attribute import *
 from .color import *

opengeodeweb_viewer-1.15.0/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/edge_attribute.json

@@ -0,0 +1,19 @@
+{
+  "rpc": "edge_attribute",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "name": {
+      "type": "string",
+      "minLength": 1
+    }
+  },
+  "required": [
+    "id",
+    "name"
+  ],
+  "additionalProperties": false
+}

opengeodeweb_viewer-1.15.0/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/edge_attribute.py

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

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/width.json

@@ -1,5 +1,5 @@
 {
-  "rpc": "size",
+  "rpc": "width",
   "type": "object",
   "properties": {
     "id": {

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -13,6 +13,7 @@ from vtkmodules.vtkRenderingCore import (
     vtkRenderWindowInteractor,
     vtkAbstractMapper,
     vtkWorldPointPicker,
+    vtkPicker,
 )
 from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackball
 from vtkmodules.vtkCommonCore import reference
@@ -224,20 +225,15 @@ class VtkViewerView(VtkView):
         params = schemas.PickedIDS.from_dict(rpc_params)
         renderWindow = self.getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
-        picker = vtkWorldPointPicker()
-        picker.Pick([params.x, params.y, 0], renderer)
-        point = picker.GetPickPosition()
-        epsilon = self.computeEpsilon(renderer, point[2])
-        bbox = vtkBoundingBox()
-        bbox.AddPoint(point[0] + epsilon, point[1] + epsilon, point[2] + epsilon)
-        bbox.AddPoint(point[0] - epsilon, point[1] - epsilon, point[2] - epsilon)
-
+        picker = vtkPicker()
+        picker.Pick(params.x, params.y, 0, renderer)
+        picked_actor = picker.GetActor()
         array_ids = []
-        for id in params.ids:
-            bounds = self.get_object(id).actor.GetBounds()
-            bounds_box = vtkBoundingBox(bounds)
-            if bbox.Intersects(bounds_box):
-                array_ids.append(id)
+        if picked_actor:
+            for id in params.ids:
+                if self.get_object(id).actor == picked_actor:
+                    array_ids.append(id)
+                    break
 
         return {"array_ids": array_ids}
 

{opengeodeweb_viewer-1.14.0rc2 → opengeodeweb_viewer-1.15.0}/src/opengeodeweb_viewer/vtkw_server.py

@@ -44,7 +44,6 @@ from .rpc.model.blocks.model_blocks_protocols import (
 from .rpc.generic.generic_protocols import VtkGenericView
 from .rpc.utils_protocols import VtkUtilsView
 
-
 # =============================================================================
 # Server class
 # =============================================================================

opengeodeweb_viewer-1.14.0rc2/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/size.json

@@ -1,18 +0,0 @@
-{
-  "rpc": "size",
-  "type": "object",
-  "properties": {
-    "id": {
-      "type": "string",
-      "minLength": 1
-    },
-    "size": {
-      "type": "integer"
-    }
-  },
-  "required": [
-    "id",
-    "size"
-  ],
-  "additionalProperties": false
-}

opengeodeweb_viewer-1.14.0rc2/src/opengeodeweb_viewer/rpc/mesh/edges/schemas/size.py

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