OpenGeodeWeb-Viewer 1.29.0rc2__tar.gz → 1.30.0__tar.gz

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.29.0rc2
+Version: 1.30.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.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/OpenGeodeWeb_Viewer.egg-info/SOURCES.txt

@@ -224,6 +224,8 @@ src/opengeodeweb_viewer/rpc/viewer/schemas/shrink.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/shrink.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/take_screenshot.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/take_screenshot.py
+src/opengeodeweb_viewer/rpc/viewer/schemas/threshold.json
+src/opengeodeweb_viewer/rpc/viewer/schemas/threshold.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/update_camera.json
 src/opengeodeweb_viewer/rpc/viewer/schemas/update_camera.py
 src/opengeodeweb_viewer/rpc/viewer/schemas/update_data.json

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/blocks/model_blocks_protocols.py

@@ -40,5 +40,9 @@ class VtkModelBlocksView(VtkModelView):
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

{opengeodeweb_viewer-1.29.0rc2/src/opengeodeweb_viewer/rpc/model/lines → opengeodeweb_viewer-1.30.0/src/opengeodeweb_viewer/rpc/model/blocks}/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/blocks/schemas/color.py

@@ -28,4 +28,5 @@ class Color(DataClassJsonMixin):
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/corners/model_corners_protocols.py

@@ -40,5 +40,9 @@ class VtkModelCornersView(VtkModelView):
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

{opengeodeweb_viewer-1.29.0rc2/src/opengeodeweb_viewer/rpc/model/surfaces → opengeodeweb_viewer-1.30.0/src/opengeodeweb_viewer/rpc/model/corners}/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/corners/schemas/color.py

@@ -28,4 +28,5 @@ class Color(DataClassJsonMixin):
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/lines/model_lines_protocols.py

@@ -40,5 +40,9 @@ class VtkModelLinesView(VtkModelView):
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

{opengeodeweb_viewer-1.29.0rc2/src/opengeodeweb_viewer/rpc/model/blocks → opengeodeweb_viewer-1.30.0/src/opengeodeweb_viewer/rpc/model/lines}/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/lines/schemas/color.py

@@ -28,4 +28,5 @@ class Color(DataClassJsonMixin):
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -68,6 +68,7 @@ class VtkModelView(VtkObjectView):
         block_ids: list[int],
         color_mode: str,
         color: Optional[ColorProtocol] = None,
+        collection_id: Optional[str] = None,
     ) -> list[ColorResult]:
         mapper = pipeline.mapper
         if not isinstance(mapper, vtkCompositePolyDataMapper):
@@ -82,7 +83,9 @@ class VtkModelView(VtkObjectView):
             if isinstance(block_dataset, vtkDataSet):
                 if color_mode == "random":
                     geode_id = pipeline.blockGeodeIds[block_id]
-                    red, green, blue = deterministic_color(f"{geode_id}_{block_id}")
+                    red, green, blue = deterministic_color(
+                        collection_id or f"{geode_id}_{block_id}"
+                    )
                     attr.SetBlockColor(block_dataset, [red, green, blue])
                     attr.SetBlockOpacity(block_dataset, 1.0)
                     colors.append(

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/surfaces/model_surfaces_protocols.py

@@ -40,5 +40,9 @@ class VtkModelSurfacesView(VtkModelView):
         params = schemas.Color.from_dict(rpc_params)
         pipeline = self.get_vtk_pipeline(params.id)
         return self.apply_color(
-            pipeline, params.block_ids, params.color_mode.value, params.color
+            pipeline,
+            params.block_ids,
+            params.color_mode.value,
+            params.color,
+            params.collection_id,
         )

{opengeodeweb_viewer-1.29.0rc2/src/opengeodeweb_viewer/rpc/model/corners → opengeodeweb_viewer-1.30.0/src/opengeodeweb_viewer/rpc/model/surfaces}/schemas/color.json

@@ -15,6 +15,10 @@
       "type": "string",
       "enum": ["constant", "random"]
     },
+    "collection_id": {
+      "type": "string",
+      "minLength": 1
+    },
     "color": {
       "type": "object",
       "properties": {

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/model/surfaces/schemas/color.py

@@ -28,4 +28,5 @@ class Color(DataClassJsonMixin):
     block_ids: List[int]
     color_mode: ColorMode
     id: str
+    collection_id: Optional[str] = None
     color: Optional[ColorClass] = None

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/__init__.py

@@ -1,5 +1,6 @@
 from .update_data import *
 from .update_camera import *
+from .threshold import *
 from .take_screenshot import *
 from .shrink import *
 from .set_z_scaling import *

opengeodeweb_viewer-1.30.0/src/opengeodeweb_viewer/rpc/viewer/schemas/threshold.json

@@ -0,0 +1,52 @@
+{
+  "rpc": "threshold",
+  "type": "object",
+  "properties": {
+    "ids": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 32,
+        "maxLength": 32
+      }
+    },
+    "attribute": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "minLength": 1
+        },
+        "location": {
+          "type": "string",
+          "enum": [
+            "point",
+            "cell"
+          ]
+        },
+        "item": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "minimum": {
+          "type": "number"
+        },
+        "maximum": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "name",
+        "location",
+        "item",
+        "minimum",
+        "maximum"
+      ],
+      "additionalProperties": false
+    }
+  },
+  "required": [
+    "ids"
+  ],
+  "additionalProperties": false
+}

opengeodeweb_viewer-1.30.0/src/opengeodeweb_viewer/rpc/viewer/schemas/threshold.py

@@ -0,0 +1,30 @@
+from dataclasses_json import DataClassJsonMixin
+from enum import Enum
+from dataclasses import dataclass
+from typing import List, Optional
+
+
+class Location(Enum):
+    CELL = "cell"
+    POINT = "point"
+
+
+@dataclass
+class Attribute(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    item: int
+    location: Location
+    maximum: float
+    minimum: float
+    name: str
+
+
+@dataclass
+class Threshold(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    ids: List[str]
+    attribute: Optional[Attribute] = None

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -385,6 +385,14 @@ class VtkViewerView(VtkView):
         params = schemas.Shrink.from_dict(rpc_params)
         self.set_shrink(params.ids, params.shrink_factor)
 
+    @exportRpc(viewer_prefix + viewer_schemas_dict["threshold"]["rpc"])
+    def setThreshold(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params, self.viewer_schemas_dict["threshold"], self.viewer_prefix
+        )
+        params = schemas.Threshold.from_dict(rpc_params)
+        self.set_threshold(params.ids, params.attribute)
+
     @exportRpc(viewer_prefix + viewer_schemas_dict["set_z_scaling"]["rpc"])
     def setZScaling(self, rpc_params: RpcParams) -> None:
         validate_schema(

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/vtk_pipeline.py

@@ -35,6 +35,7 @@ from vtkmodules.vtkFiltersExtraction import (
     vtkExtractGeometry,
     vtkExtractSelection,
 )
+from vtkmodules.vtkFiltersCore import vtkThreshold
 from vtkmodules.vtkFiltersGeneral import vtkShrinkFilter
 from vtkmodules.vtkFiltersGeometry import vtkGeometryFilter
 from vtkmodules.vtkIOXML import vtkXMLReader
@@ -211,6 +212,7 @@ class VtkPipeline:
     filter: vtkGeometryFilter = field(default_factory=vtkGeometryFilter)
     actor: vtkActor = field(default_factory=vtkActor)
     clipping_filter: vtkExtractGeometry | None = None
+    threshold_filter: vtkThreshold | None = None
     shrink_filter: vtkShrinkFilter | None = None
     highlight: HighlightPipeline = field(default_factory=HighlightPipeline)
     blockDataSets: list[vtkDataObject | None] = field(default_factory=list)

{opengeodeweb_viewer-1.29.0rc2 → opengeodeweb_viewer-1.30.0}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -23,6 +23,7 @@ from vtkmodules.vtkCommonDataModel import (
     vtkPlane,
     vtkSelectionNode,
 )
+from vtkmodules.vtkFiltersCore import vtkThreshold
 from vtkmodules.vtkFiltersExtraction import vtkExtractGeometry
 from vtkmodules.vtkFiltersGeneral import vtkShrinkFilter
 from vtkmodules.vtkFiltersGeometry import vtkGeometryFilter
@@ -37,6 +38,7 @@ from vtkmodules.vtkInteractionWidgets import vtkOrientationMarkerWidget
 from opengeodeweb_microservice.database.connection import get_session
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_viewer.rpc.viewer.schemas.clipping_planes import Plane
+from opengeodeweb_viewer.rpc.viewer.schemas.threshold import Attribute, Location
 from opengeodeweb_viewer.vtk_pipeline import (
     RulerPipeline,
     ViewerData,
@@ -179,7 +181,11 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
         current_input_port = pipeline.reader.GetOutputPort()
         active_filters = [
             filter_obj
-            for filter_obj in (pipeline.clipping_filter, pipeline.shrink_filter)
+            for filter_obj in (
+                pipeline.clipping_filter,
+                pipeline.threshold_filter,
+                pipeline.shrink_filter,
+            )
             if filter_obj is not None
         ]
         for filter_obj in active_filters:
@@ -219,6 +225,30 @@ class VtkView(VtkTypingMixin, vtk_protocols.vtkWebProtocol):
                 pipeline.clipping_filter = None
             self.update_pipeline_filter(pipeline)
 
+    def set_threshold(self, data_ids: list[str], attribute: Attribute | None) -> None:
+        for data_id in data_ids:
+            pipeline = self.get_vtk_pipeline(data_id)
+            if attribute:
+                threshold_filter = vtkThreshold()
+                threshold_filter.SetInputArrayToProcess(
+                    0,
+                    0,
+                    0,
+                    (
+                        vtkDataObject.FIELD_ASSOCIATION_POINTS
+                        if attribute.location == Location.POINT
+                        else vtkDataObject.FIELD_ASSOCIATION_CELLS
+                    ),
+                    attribute.name,
+                )
+                threshold_filter.SetSelectedComponent(attribute.item)
+                threshold_filter.SetLowerThreshold(attribute.minimum)
+                threshold_filter.SetUpperThreshold(attribute.maximum)
+                pipeline.threshold_filter = threshold_filter
+            else:
+                pipeline.threshold_filter = None
+            self.update_pipeline_filter(pipeline)
+
     def set_shrink(self, data_ids: list[str], shrink_factor: float) -> None:
         for data_id in data_ids:
             pipeline = self.get_vtk_pipeline(data_id)