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

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

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

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

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

@@ -195,6 +195,8 @@ 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/preview_points.json
+src/opengeodeweb_viewer/rpc/viewer/schemas/preview_points.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/render.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/render.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/reset_camera.json

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

@@ -6,6 +6,7 @@ from .set_background_color import *
 from .reset_visualization import *
 from .reset_camera import *
 from .render import *
+from .preview_points import *
 from .picked_ids import *
 from .highlight import *
 from .grid_scale import *

opengeodeweb_viewer-1.21.0/src/opengeodeweb_viewer/rpc/viewer/schemas/preview_points.json

@@ -0,0 +1,44 @@
+{
+  "rpc": "preview_points",
+  "type": "object",
+  "properties": {
+    "points": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "x": {
+            "type": "number"
+          },
+          "y": {
+            "type": "number"
+          },
+          "z": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "x",
+          "y",
+          "z"
+        ],
+        "additionalProperties": false
+      }
+    },
+    "style": {
+      "type": "string",
+      "enum": [
+        "points",
+        "curve"
+      ]
+    },
+    "closed": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "points",
+    "style"
+  ],
+  "additionalProperties": false
+}

opengeodeweb_viewer-1.21.0/src/opengeodeweb_viewer/rpc/viewer/schemas/preview_points.py

@@ -0,0 +1,29 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+from enum import Enum
+from typing import List, Optional
+
+
+@dataclass
+class Point(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    x: float
+    y: float
+    z: float
+
+
+class Style(Enum):
+    CURVE = "curve"
+    POINTS = "points"
+
+
+@dataclass
+class PreviewPoints(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    points: List[Point]
+    style: Style
+    closed: Optional[bool] = None

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

@@ -13,14 +13,15 @@ from vtkmodules.vtkRenderingCore import (
     vtkRenderWindowInteractor,
     vtkAbstractMapper,
     vtkWorldPointPicker,
-    vtkPicker,
     vtkCellPicker,
     vtkPropPicker,
     vtkCompositePolyDataMapper,
+    vtkDataSetMapper,
+    vtkActor,
 )
 from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackball
-from vtkmodules.vtkCommonCore import reference, vtkIdTypeArray
-from vtkmodules.vtkCommonDataModel import vtkBoundingBox, vtkDataSet, vtkSelectionNode
+from vtkmodules.vtkCommonCore import reference, vtkPoints, vtkUnsignedCharArray
+from vtkmodules.vtkCommonDataModel import vtkDataSet, vtkPolyData, vtkCellArray
 from vtkmodules.vtkCommonTransforms import vtkTransform
 from vtkmodules.vtkInteractionWidgets import vtkOrientationMarkerWidget
 from opengeodeweb_microservice.schemas import get_schemas_dict
@@ -42,6 +43,7 @@ class VtkViewerView(VtkView):
 
     def __init__(self) -> None:
         super().__init__()
+        self._preview_actor: vtkActor | None = None
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["reset_visualization"]["rpc"])
     def resetVisualization(self, rpc_params: RpcParams) -> None:
@@ -236,12 +238,24 @@ class VtkViewerView(VtkView):
         )
         params = schemas.PickedIDS.from_dict(rpc_params)
         renderer = self.getView("-1").GetRenderers().GetFirstRenderer()
+
+        actors = []
         picker = vtkCellPicker(tolerance=0.005)
         picker.Pick(params.x, params.y, 0, renderer)
         actor = picker.GetActor()
         viewer_id = picker.GetFlatBlockIndex()
+
+        while actor:
+            actors.append(actor)
+            actor.SetPickable(False)
+            picker.Pick(params.x, params.y, 0, renderer)
+            actor = picker.GetActor()
+
+        for actor in actors:
+            actor.SetPickable(True)
+
         array_ids = [
-            id for id in params.ids if self.get_vtk_pipeline(id).actor == actor
+            id for id in params.ids if self.get_vtk_pipeline(id).actor in actors
         ]
         if not array_ids:
             return {"array_ids": [], "viewer_id": None}
@@ -395,3 +409,66 @@ class VtkViewerView(VtkView):
         grid_scale = self.get_grid_scale()
         if grid_scale is not None:
             grid_scale.SetUse2DMode(True)
+
+    @exportRpc(viewer_prefix + viewer_schemas_dict["preview_points"]["rpc"])
+    def previewPoints(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params, self.viewer_schemas_dict["preview_points"], self.viewer_prefix
+        )
+        params = schemas.PreviewPoints.from_dict(rpc_params)
+        points_data = params.points
+        style_name = (
+            params.style.value if hasattr(params.style, "value") else params.style
+        )
+
+        if not points_data:
+            if self._preview_actor is not None:
+                self.get_renderer().RemoveActor(self._preview_actor)
+                self._preview_actor = None
+                self.render(-1)
+            return
+
+        if self._preview_actor is None:
+            self._preview_points = vtkPoints()
+            self._preview_verts = vtkCellArray()
+            self._preview_polydata = vtkPolyData()
+            self._preview_polydata.SetPoints(self._preview_points)
+            self._preview_polydata.SetVerts(self._preview_verts)
+            self._preview_mapper = vtkDataSetMapper()
+            self._preview_mapper.SetInputData(self._preview_polydata)
+            self._preview_mapper.ScalarVisibilityOn()
+            self._preview_mapper.SetColorModeToDirectScalars()
+            self._preview_actor = vtkActor()
+            self._preview_actor.SetMapper(self._preview_mapper)
+            prop = self._preview_actor.GetProperty()
+            prop.SetPointSize(10)
+            prop.SetLineWidth(2)
+            self.get_renderer().AddActor(self._preview_actor)
+
+        self._preview_points.Reset()
+        self._preview_verts.Reset()
+
+        colors = vtkUnsignedCharArray()
+        colors.SetName("Colors")
+        colors.SetNumberOfComponents(3)
+
+        for i, pt in enumerate(points_data):
+            self._preview_points.InsertNextPoint(pt.x, pt.y, pt.z)
+            self._preview_verts.InsertNextCell(1, [i])
+            if style_name == "curve" and i == 0:
+                colors.InsertNextTuple3(60, 153, 131)
+            else:
+                colors.InsertNextTuple3(102, 102, 102)
+
+        self._preview_polydata.GetPointData().SetScalars(colors)
+        self._preview_polydata.GetPointData().SetActiveScalars("Colors")
+
+        lines = vtkCellArray()
+        if style_name == "curve":
+            for i in range(len(points_data) - 1):
+                lines.InsertNextCell(2, [i, i + 1])
+            if params.closed and len(points_data) >= 2:
+                lines.InsertNextCell(2, [len(points_data) - 1, 0])
+        self._preview_polydata.SetLines(lines)
+        self._preview_polydata.Modified()
+        self.render(-1)

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

@@ -183,18 +183,26 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
         grid_scale = self.get_grid_scale()
         if grid_scale is not None:
             renderer = self.get_renderer()
-            bounds = vtkBoundingBox()
-            props = renderer.GetViewProps()
-            props.InitTraversal()
-            prop = props.GetNextProp()
-            while prop:
-                if prop.GetUseBounds() and prop != grid_scale:
-                    bounds.AddBounds(prop.GetBounds())
+            if not grid_scale.GetVisibility():
+                bounds = vtkBoundingBox()
+                props = renderer.GetViewProps()
+                props.InitTraversal()
                 prop = props.GetNextProp()
-            if bounds.IsValid():
-                final_bounds = [0.0] * 6
-                bounds.GetBounds(final_bounds)
-                grid_scale.SetBounds(final_bounds)
+                while prop:
+                    if (
+                        prop.GetVisibility()
+                        and prop.GetUseBounds()
+                        and prop != grid_scale
+                    ):
+                        bounds.AddBounds(prop.GetBounds())
+                    prop = props.GetNextProp()
+                if bounds.IsValid():
+                    final_bounds = [0.0] * 6
+                    bounds.GetBounds(final_bounds)
+                    grid_scale.SetBounds(final_bounds)
+
+            final_bounds = list(grid_scale.GetBounds())
+            if final_bounds[0] <= final_bounds[1]:
 
                 def get_dist(axis: int) -> float:
                     p1 = [final_bounds[0], final_bounds[2], final_bounds[4]]