Merge pull request #154 from Geode-solutions/feat/attributes-model

Feat/attributes model

Author: BotellaA

opengeodeweb_viewer_schemas.json

@@ -52,7 +52,14 @@ where = ["src"]
 "opengeodeweb_viewer.rpc.model.edges.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.points.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.corners.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.corners.attribute.vertex.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.lines.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.lines.attribute.edge.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.lines.attribute.vertex.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.surfaces.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.surfaces.attribute.polygon.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.surfaces.attribute.vertex.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.model.blocks.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.blocks.attribute.polyhedron.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.model.blocks.attribute.vertex.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.viewer.schemas" = ["*.json"]

pyproject.toml

@@ -22,7 +22,7 @@ frozenlist>=1
     # via
     #   aiohttp
     #   aiosignal
-idna==3.15
+idna==3.16
     # via yarl
 kiwisolver>=1
     # via matplotlib
@@ -61,4 +61,3 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.1.3

requirements.txt

@@ -70,6 +70,27 @@
 from opengeodeweb_viewer.rpc.model.blocks.model_blocks_protocols import (
     VtkModelBlocksView,
 )
+from opengeodeweb_viewer.rpc.model.corners.attribute.vertex.corners_attribute_vertex_protocols import (
+    VtkModelCornersAttributeVertexView,
+)
+from opengeodeweb_viewer.rpc.model.lines.attribute.vertex.lines_attribute_vertex_protocols import (
+    VtkModelLinesAttributeVertexView,
+)
+from opengeodeweb_viewer.rpc.model.lines.attribute.edge.lines_attribute_edge_protocols import (
+    VtkModelLinesAttributeEdgeView,
+)
+from opengeodeweb_viewer.rpc.model.surfaces.attribute.vertex.surfaces_attribute_vertex_protocols import (
+    VtkModelSurfacesAttributeVertexView,
+)
+from opengeodeweb_viewer.rpc.model.surfaces.attribute.polygon.surfaces_attribute_polygon_protocols import (
+    VtkModelSurfacesAttributePolygonView,
+)
+from opengeodeweb_viewer.rpc.model.blocks.attribute.vertex.blocks_attribute_vertex_protocols import (
+    VtkModelBlocksAttributeVertexView,
+)
+from opengeodeweb_viewer.rpc.model.blocks.attribute.polyhedron.blocks_attribute_polyhedron_protocols import (
+    VtkModelBlocksAttributePolyhedronView,
+)
 from opengeodeweb_viewer.rpc.generic.generic_protocols import VtkGenericView
 from opengeodeweb_viewer.rpc.utils_protocols import VtkUtilsView
 
@@ -136,6 +157,13 @@ def initialize(self) -> None:
         self.registerVtkWebProtocol(VtkModelLinesView())
         self.registerVtkWebProtocol(VtkModelSurfacesView())
         self.registerVtkWebProtocol(VtkModelBlocksView())
+        self.registerVtkWebProtocol(VtkModelCornersAttributeVertexView())
+        self.registerVtkWebProtocol(VtkModelLinesAttributeVertexView())
+        self.registerVtkWebProtocol(VtkModelLinesAttributeEdgeView())
+        self.registerVtkWebProtocol(VtkModelSurfacesAttributeVertexView())
+        self.registerVtkWebProtocol(VtkModelSurfacesAttributePolygonView())
+        self.registerVtkWebProtocol(VtkModelBlocksAttributeVertexView())
+        self.registerVtkWebProtocol(VtkModelBlocksAttributePolyhedronView())
         self.registerVtkWebProtocol(VtkGenericView(mesh_protocols, model_protocols))
 
         # tell the C++ web app to use no encoding.

src/opengeodeweb_viewer/app.py

@@ -0,0 +1,56 @@
+# Standard library imports
+import os
+
+# Third party imports
+from wslink import register as exportRpc  # type: ignore
+from opengeodeweb_microservice.schemas import get_schemas_dict
+
+# Local application imports
+from opengeodeweb_viewer.utils_functions import (
+    validate_schema,
+    RpcParams,
+)
+from opengeodeweb_viewer.rpc.model.model_protocols import VtkModelView
+from . import schemas
+
+
+class VtkModelBlocksAttributePolyhedronView(VtkModelView):
+    model_blocks_attribute_polyhedron_prefix = (
+        "opengeodeweb_viewer.model.blocks.attribute.polyhedron."
+    )
+    model_blocks_attribute_polyhedron_schemas_dict = get_schemas_dict(
+        os.path.join(os.path.dirname(__file__), "schemas")
+    )
+
+    def __init__(self) -> None:
+        super().__init__()
+
+    @exportRpc(
+        model_blocks_attribute_polyhedron_prefix
+        + model_blocks_attribute_polyhedron_schemas_dict["name"]["rpc"]
+    )
+    def setModelBlocksPolyhedronAttributeName(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params,
+            self.model_blocks_attribute_polyhedron_schemas_dict["name"],
+            self.model_blocks_attribute_polyhedron_prefix,
+        )
+        params = schemas.Name.from_dict(rpc_params)
+        pipeline = self.get_vtk_pipeline(params.id)
+        self.displayAttributeOnCells(pipeline, params.block_ids, params.name)
+
+    @exportRpc(
+        model_blocks_attribute_polyhedron_prefix
+        + model_blocks_attribute_polyhedron_schemas_dict["color_map"]["rpc"]
+    )
+    def setModelBlocksPolyhedronAttributeColorMap(self, rpc_params: RpcParams) -> None:
+        validate_schema(
+            rpc_params,
+            self.model_blocks_attribute_polyhedron_schemas_dict["color_map"],
+            self.model_blocks_attribute_polyhedron_prefix,
+        )
+        params = schemas.ColorMap.from_dict(rpc_params)
+        pipeline = self.get_vtk_pipeline(params.id)
+        self.setupColorMap(
+            pipeline, params.block_ids, params.points, params.minimum, params.maximum
+        )

src/opengeodeweb_viewer/rpc/model/blocks/attribute/polyhedron/blocks_attribute_polyhedron_protocols.py

@@ -0,0 +1,2 @@
+from .name import *
+from .color_map import *

src/opengeodeweb_viewer/rpc/model/blocks/attribute/polyhedron/schemas/__init__.py

@@ -0,0 +1,31 @@
+{
+  "rpc": "color_map",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "block_ids": {
+      "type": "array",
+      "items": { "type": "integer" },
+      "minItems": 1
+    },
+    "points": {
+      "type": "array",
+      "description": "Flat array of [value, r, g, b, ...]",
+      "items": {
+        "type": "number"
+      },
+      "minItems": 8
+    },
+    "minimum": {
+      "type": "number"
+    },
+    "maximum": {
+      "type": "number"
+    }
+  },
+  "required": ["id", "block_ids", "points", "minimum", "maximum"],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/rpc/model/blocks/attribute/polyhedron/schemas/color_map.json

@@ -0,0 +1,16 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+from typing import List
+
+
+@dataclass
+class ColorMap(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    block_ids: List[int]
+    id: str
+    maximum: float
+    minimum: float
+    points: List[float]
+    """Flat array of [value, r, g, b, ...]"""

src/opengeodeweb_viewer/rpc/model/blocks/attribute/polyhedron/schemas/color_map.py

@@ -0,0 +1,25 @@
+{
+  "rpc": "name",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "block_ids": {
+      "type": "array",
+      "items": { "type": "integer" },
+      "minItems": 1
+    },
+    "name": {
+      "type": "string",
+      "minLength": 1
+    }
+  },
+  "required": [
+    "id",
+    "block_ids",
+    "name"
+  ],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/rpc/model/blocks/attribute/polyhedron/schemas/name.json

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