blocks colors rpc & tests

JulienChampagnol · JulienChampagnol · commit 1ab29dbebdd0 · 2025-03-19T12:07:01.000+01:00
diff --git a/src/opengeodeweb_viewer/object/object_methods.py b/src/opengeodeweb_viewer/object/object_methods.py
@@ -142,14 +142,13 @@ def SetBlocksVisibility(self, id, block_ids, visibility):
         mapper = self.get_object(id)["mapper"]
         for block_id in block_ids:
             mapper.SetBlockVisibility(block_id, visibility)
-            print(f"{block_id=}{mapper.GetBlockVisibility(block_id)=}", flush=True)
         self.render()
 
-    # def SetBlocksPointsSize(self, id, block_ids, size):
-    #     actor = self.get_object(id)["actor"]
-    #     for block_id in block_ids:
-    #         block_actor = actor.GetChildren().GetItemAsObject(block_id)
-    #         block_actor.GetProperty().SetPointSize(size)
+    def SetBlocksColor(self, id, block_ids, red, green, blue):
+        mapper = self.get_object(id)["mapper"]
+        for block_id in block_ids:
+            mapper.SetBlockColor(block_id, [red / 255, green / 255, blue / 255])
+        self.render()
 
     def clearColors(self, id):
         db = self.get_object(id)
diff --git a/src/opengeodeweb_viewer/rpc/model/blocks/polyhedrons/blocks_polyhedrons_protocols.py b/src/opengeodeweb_viewer/rpc/model/blocks/polyhedrons/blocks_polyhedrons_protocols.py
@@ -38,3 +38,24 @@ def setModelBlocksPolyhedronsVisibility(self, params):
             params["visibility"],
         )
         self.SetBlocksVisibility(id, block_ids, visibility)
+
+    @exportRpc(
+        model_blocks_polyhedrons_prefix
+        + model_blocks_polyhedrons_schemas_dict["color"]["rpc"]
+    )
+    def setModelBlocksPolyhedronsColor(self, params):
+        print(
+            self.model_blocks_polyhedrons_prefix
+            + self.model_blocks_polyhedrons_schemas_dict["color"]["rpc"],
+            f"{params=}",
+            flush=True,
+        )
+        validate_schema(params, self.model_blocks_polyhedrons_schemas_dict["color"])
+        id, block_ids, red, green, blue = (
+            params["id"],
+            params["block_ids"],
+            params["color"]["r"],
+            params["color"]["g"],
+            params["color"]["b"],
+        )
+        self.SetBlocksColor(id, block_ids, red, green, blue)
diff --git a/src/opengeodeweb_viewer/rpc/model/corners/points/corners_points_protocols.py b/src/opengeodeweb_viewer/rpc/model/corners/points/corners_points_protocols.py
@@ -22,7 +22,7 @@ def __init__(self):
         model_corners_points_prefix
         + model_corners_points_schemas_dict["visibility"]["rpc"]
     )
-    def setCornersPointsVisibility(self, params):
+    def setModelCornersPointsVisibility(self, params):
         print(
             self.model_corners_points_prefix
             + self.model_corners_points_schemas_dict["visibility"]["rpc"],
@@ -36,3 +36,23 @@ def setCornersPointsVisibility(self, params):
             params["visibility"],
         )
         self.SetBlocksVisibility(id, block_ids, visibility)
+
+    @exportRpc(
+        model_corners_points_prefix + model_corners_points_schemas_dict["color"]["rpc"]
+    )
+    def setModelCornersPointsColor(self, params):
+        print(
+            self.model_corners_points_prefix
+            + self.model_corners_points_schemas_dict["color"]["rpc"],
+            f"{params=}",
+            flush=True,
+        )
+        validate_schema(params, self.model_corners_points_schemas_dict["color"])
+        id, block_ids, red, green, blue = (
+            params["id"],
+            params["block_ids"],
+            params["color"]["r"],
+            params["color"]["g"],
+            params["color"]["b"],
+        )
+        self.SetBlocksColor(id, block_ids, red, green, blue)
diff --git a/src/opengeodeweb_viewer/rpc/model/corners/points/schemas/color.json b/src/opengeodeweb_viewer/rpc/model/corners/points/schemas/color.json
@@ -6,7 +6,7 @@
       "type": "string",
       "minLength": 1
     },
-    "block_idss": {
+    "block_ids": {
       "type": "array",
       "items": {
         "type": "integer",
@@ -49,7 +49,7 @@
   },
   "required": [
     "id",
-    "block_idss",
+    "block_ids",
     "color"
   ],
   "additionalProperties": false
diff --git a/src/opengeodeweb_viewer/rpc/model/corners/points/schemas/size.json b/src/opengeodeweb_viewer/rpc/model/corners/points/schemas/size.json
diff --git a/src/opengeodeweb_viewer/rpc/model/lines/edges/lines_edges_protocols.py b/src/opengeodeweb_viewer/rpc/model/lines/edges/lines_edges_protocols.py
@@ -21,7 +21,7 @@ def __init__(self):
     @exportRpc(
         model_lines_edges_prefix + model_lines_edges_schemas_dict["visibility"]["rpc"]
     )
-    def setModelSurfacesPolygonsVisibility(self, params):
+    def setModelLinesEdgesVisibility(self, params):
         print(
             self.model_lines_edges_prefix
             + self.model_lines_edges_schemas_dict["visibility"]["rpc"],
@@ -35,3 +35,23 @@ def setModelSurfacesPolygonsVisibility(self, params):
             params["visibility"],
         )
         self.SetBlocksVisibility(id, block_ids, visibility)
+
+    @exportRpc(
+        model_lines_edges_prefix + model_lines_edges_schemas_dict["color"]["rpc"]
+    )
+    def setModelLinesEdgesColor(self, params):
+        print(
+            self.model_lines_edges_prefix
+            + self.model_lines_edges_schemas_dict["color"]["rpc"],
+            f"{params=}",
+            flush=True,
+        )
+        validate_schema(params, self.model_lines_edges_schemas_dict["color"])
+        id, block_ids, red, green, blue = (
+            params["id"],
+            params["block_ids"],
+            params["color"]["r"],
+            params["color"]["g"],
+            params["color"]["b"],
+        )
+        self.SetBlocksColor(id, block_ids, red, green, blue)
diff --git a/src/opengeodeweb_viewer/rpc/model/lines/edges/schemas/color.json b/src/opengeodeweb_viewer/rpc/model/lines/edges/schemas/color.json
@@ -9,7 +9,7 @@
     "block_ids": {
       "type": "array",
       "items": {
-        "type": "string",
+        "type": "integer",
         "minLength": 1
       },
       "minItems": 1
diff --git a/src/opengeodeweb_viewer/rpc/model/model_protocols.py b/src/opengeodeweb_viewer/rpc/model/model_protocols.py
@@ -85,32 +85,3 @@ def setModelEdgesVisibility(self, params):
         validate_schema(params, self.model_schemas_dict["edges.visibility"])
         id, visibility = params["id"], params["visibility"]
         self.SetEdgesVisibility(id, visibility)
-
-    # @exportRpc(model_prefix + model_schemas_dict["set_components_visibility"]["rpc"])
-    # def setComponentsVisibility(self, params):
-    #     print(
-    #         self.model_prefix
-    #         + self.model_schemas_dict["set_components_visibility"]["rpc"],
-    #         f"{params=}",
-    #         flush=True,
-    #     )
-    #     validate_schema(params, self.model_schemas_dict["set_components_visibility"])
-    #     id = params["id"]
-    #     visibility = bool(params["visibility"])
-    #     self.SetVisibility(id, visibility)
-
-    # @exportRpc(model_prefix + model_schemas_dict["set_components_color"]["rpc"])
-    # def setComponentsColor(self, params):
-    #     print(
-    #         self.model_prefix + self.model_schemas_dict["set_components_color"]["rpc"],
-    #         f"{params=}",
-    #         flush=True,
-    #     )
-    #     validate_schema(params, self.model_schemas_dict["set_components_color"])
-    #     id = params["id"]
-    #     red, green, blue = (
-    #         params["color"]["r"],
-    #         params["color"]["g"],
-    #         params["color"]["b"],
-    #     )
-    #     self.SetColor(id, red, green, blue)
diff --git a/src/opengeodeweb_viewer/rpc/model/surfaces/polygons/schemas/color.json b/src/opengeodeweb_viewer/rpc/model/surfaces/polygons/schemas/color.json
@@ -9,7 +9,7 @@
     "block_ids": {
       "type": "array",
       "items": {
-        "type": "string",
+        "type": "integer",
         "minLength": 1
       },
       "minItems": 1
diff --git a/src/opengeodeweb_viewer/rpc/model/surfaces/polygons/surfaces_polygons_protocols.py b/src/opengeodeweb_viewer/rpc/model/surfaces/polygons/surfaces_polygons_protocols.py
@@ -36,3 +36,24 @@ def setModelSurfacesPolygonsVisibility(self, params):
             params["visibility"],
         )
         self.SetBlocksVisibility(id, block_ids, visibility)
+
+    @exportRpc(
+        model_surfaces_polygons_prefix
+        + model_surfaces_polygons_schemas_dict["color"]["rpc"]
+    )
+    def setModelSurfacesPolygonsCOlor(self, params):
+        print(
+            self.model_surfaces_polygons_prefix
+            + self.model_surfaces_polygons_schemas_dict["color"]["rpc"],
+            f"{params=}",
+            flush=True,
+        )
+        validate_schema(params, self.model_surfaces_polygons_schemas_dict["color"])
+        id, block_ids, red, green, blue = (
+            params["id"],
+            params["block_ids"],
+            params["color"]["r"],
+            params["color"]["g"],
+            params["color"]["b"],
+        )
+        self.SetBlocksColor(id, block_ids, red, green, blue)
diff --git a/src/tests/data/images/model/blocks/polyhedrons/color.jpeg b/src/tests/data/images/model/blocks/polyhedrons/color.jpeg
diff --git a/src/tests/data/images/model/lines/edges/color.jpeg b/src/tests/data/images/model/lines/edges/color.jpeg
diff --git a/src/tests/data/images/model/surfaces/polygons/color.jpeg b/src/tests/data/images/model/surfaces/polygons/color.jpeg
diff --git a/src/tests/model/blocks/polyhedrons/test_model_blocks_polyhedrons_protocols.py b/src/tests/model/blocks/polyhedrons/test_model_blocks_polyhedrons_protocols.py
@@ -9,7 +9,7 @@
 from src.tests.model.test_model_protocols import test_register_model_cube
 
 
-def test_surfaces_polygons_visibility(server):
+def test_blocks_polyhedrons_visibility(server):
 
     test_register_model_cube(server)
 
@@ -44,3 +44,23 @@ def test_surfaces_polygons_visibility(server):
     )
 
     assert server.compare_image(3, "model/blocks/polyhedrons/visibility.jpeg") == True
+
+
+def test_blocks_polyhedrons_color(server):
+
+    test_blocks_polyhedrons_visibility(server)
+
+    server.call(
+        VtkModelBlocksPolyhedronsView.model_blocks_polyhedrons_prefix
+        + VtkModelBlocksPolyhedronsView.model_blocks_polyhedrons_schemas_dict["color"][
+            "rpc"
+        ],
+        [
+            {
+                "id": "123456789",
+                "block_ids": list(range(48, 50)),
+                "color": {"r": 255, "g": 0, "b": 0},
+            }
+        ],
+    )
+    assert server.compare_image(3, "model/blocks/polyhedrons/color.jpeg") == True
diff --git a/src/tests/model/corners/points/test_model_corners_points_protocols.py b/src/tests/model/corners/points/test_model_corners_points_protocols.py
@@ -42,3 +42,21 @@ def test_corners_points_visibility(server):
         ],
     )
     assert server.compare_image(3, "model/corners/points/visibility.jpeg") == True
+
+
+def test_corners_points_color(server):
+
+    test_corners_points_visibility(server)
+
+    server.call(
+        VtkModelCornersPointsView.model_corners_points_prefix
+        + VtkModelCornersPointsView.model_corners_points_schemas_dict["color"]["rpc"],
+        [
+            {
+                "id": "123456789",
+                "block_ids": list(range(1, 13)),
+                "color": {"r": 255, "g": 0, "b": 0},
+            }
+        ],
+    )
+    assert server.compare_image(3, "model/corners/points/color.jpeg") == True
diff --git a/src/tests/model/lines/edges/test_model_lines_edges_protocols.py b/src/tests/model/lines/edges/test_model_lines_edges_protocols.py
@@ -9,7 +9,7 @@
 from src.tests.model.test_model_protocols import test_register_model_cube
 
 
-def test_corners_points_visibility(server):
+def test_lines_edges_visibility(server):
 
     test_register_model_cube(server)
 
@@ -38,3 +38,21 @@ def test_corners_points_visibility(server):
         ],
     )
     assert server.compare_image(3, "model/lines/edges/visibility.jpeg") == True
+
+
+def test_lines_edges_color(server):
+
+    test_lines_edges_visibility(server)
+
+    server.call(
+        VtkModelLinesEdgesView.model_lines_edges_prefix
+        + VtkModelLinesEdgesView.model_lines_edges_schemas_dict["color"]["rpc"],
+        [
+            {
+                "id": "123456789",
+                "block_ids": list(range(14, 35)),
+                "color": {"r": 255, "g": 0, "b": 0},
+            }
+        ],
+    )
+    assert server.compare_image(3, "model/lines/edges/color.jpeg") == True
diff --git a/src/tests/model/surfaces/polygons/test_model_surfaces_polygons_protocols.py b/src/tests/model/surfaces/polygons/test_model_surfaces_polygons_protocols.py
@@ -43,3 +43,23 @@ def test_surfaces_polygons_visibility(server):
     )
 
     assert server.compare_image(3, "model/surfaces/polygons/visibility.jpeg") == True
+
+
+def test_surfaces_polygons_color(server):
+
+    test_surfaces_polygons_visibility(server)
+
+    server.call(
+        VtkModelSurfacesPolygonsView.model_surfaces_polygons_prefix
+        + VtkModelSurfacesPolygonsView.model_surfaces_polygons_schemas_dict["color"][
+            "rpc"
+        ],
+        [
+            {
+                "id": "123456789",
+                "block_ids": list(range(36, 49)),
+                "color": {"r": 255, "g": 0, "b": 0},
+            }
+        ],
+    )
+    assert server.compare_image(3, "model/surfaces/polygons/color.jpeg") == True
