protocols & tests

Author: JulienChampagnol

.gitignore

@@ -9,5 +9,5 @@ __pycache__/
 latest_logs
 schemas.json
 build
-src/tests/tests_output/
+/src/tests/tests_output/
 *.egg-info

src/opengeodeweb_viewer/rpc/mesh/polygons/polygons_protocols.py

@@ -22,7 +22,7 @@ def setMeshPolygonsVisibility(self, params):
         id = params["id"]
         visibility = bool(params["visibility"])
         self.SetVisibility(id, visibility)
-
+        
     @exportRpc(mesh_polygons_prefix + mesh_polygons_schemas_dict["color"]["rpc"])
     def setMeshPolygonsColor(self, params):
         print(self.mesh_polygons_prefix + self.mesh_polygons_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
@@ -37,12 +37,12 @@ def setMeshPolygonsVertexAttribute(self, params):
         validate_schema(params, self.mesh_polygons_schemas_dict["vertex_attribute"])
         id = params["id"]
         name = str(params["name"])
-        self.setMeshVertexAttribute(id, name)
+        self.displayAttributeOnVertices(id, name)
 
     @exportRpc(mesh_polygons_prefix + mesh_polygons_schemas_dict["polygon_attribute"]["rpc"])
     def setMeshPolygonsPolygonAttribute(self, params):
         print(self.mesh_polygons_prefix + self.mesh_polygons_schemas_dict["polygon_attribute"]["rpc"], f"{params=}", flush=True)
         validate_schema(params, self.mesh_polygons_schemas_dict["polygon_attribute"])
         id = params["id"]
         name = str(params["name"])
-        self.setMeshPolygonAttribute(id, name)
+        self.displayAttributeOnCells(id, name)

src/opengeodeweb_viewer/rpc/mesh/polyhedrons/polyhedrons_protocols.py

@@ -33,11 +33,19 @@ def setMeshPolyhedronsColor(self, params):
         red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
         self.SetColor(id, red, green, blue)
 
-    # @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["vertex_attribute"]["rpc"])
-    # def setMeshPolyhedronsVertexAttribute(self, params):
-    #     print(self.mesh_polyhedrons_prefix + self.mesh_polyhedrons_schemas_dict["vertex_attribute"]["rpc"], f"{params=}", flush=True)
-    #     validate_schema(params, self.mesh_polyhedrons_schemas_dict["vertex_attribute"])
-    #     id = params["id"]
-    #     name = str(params["name"])
-    #     self.setMeshVertexAttribute(id, name)
+    @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["vertex_attribute"]["rpc"])
+    def setMeshPolyhedronsVertexAttribute(self, params):
+        print(self.mesh_polyhedrons_prefix + self.mesh_polyhedrons_schemas_dict["vertex_attribute"]["rpc"], f"{params=}", flush=True)
+        validate_schema(params, self.mesh_polyhedrons_schemas_dict["vertex_attribute"])
+        id = params["id"]
+        name = str(params["name"])
+        self.setMeshVertexAttribute(id, name)
+
+    @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["polyhedron_attribute"]["rpc"])
+    def setMeshPolyhedronsPolyhedronAttribute(self, params):
+        print(self.mesh_polyhedrons_prefix + self.mesh_polyhedrons_schemas_dict["vertex_attribute"]["rpc"], f"{params=}", flush=True)
+        validate_schema(params, self.mesh_polyhedrons_schemas_dict["vertex_attribute"])
+        id = params["id"]
+        name = str(params["name"])
+        self.setMeshPolyhedronAttribute(id, name)
 

src/opengeodeweb_viewer/rpc/mesh/polyhedrons/schemas/polygon_attribute.json renamed to src/opengeodeweb_viewer/rpc/mesh/polyhedrons/schemas/polyhedron_attribute.json

@@ -1,5 +1,5 @@
 {
-  "rpc": "polygon_attribute",
+  "rpc": "polyhedron_attribute",
   "type": "object",
   "properties": {
     "id": {

src/tests/data/images/mesh/polygons/visibility.jpeg

@@ -12,4 +12,12 @@ def test_polygons_color(server):
     test_register_mesh(server)
 
     server.call(VtkMeshPolygonsView.mesh_polygons_prefix + VtkMeshPolygonsView.mesh_polygons_schemas_dict["color"]["rpc"], [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}])
-    assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
+    assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
+
+
+def test_polygons_visibility(server):
+
+    test_register_mesh(server)
+
+    server.call(VtkMeshPolygonsView.mesh_polygons_prefix + VtkMeshPolygonsView.mesh_polygons_schemas_dict["visibility"]["rpc"], [{"id": "123456789", "visibility": False}])
+    assert server.compare_image(3, "mesh/polygons/visibility.jpeg") == True

src/tests/data/images/mesh/polyhedrons/polyhedron_attribute.jpeg

@@ -17,4 +17,26 @@ def test_polyhedrons_color(server):
     test_register_mesh(server)
 
     server.call(VtkMeshPolyhedronsView.mesh_polyhedrons_prefix + VtkMeshPolyhedronsView.mesh_polyhedrons_schemas_dict["color"]["rpc"], [{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}])
-    assert server.compare_image(3, "mesh/polyhedrons/color.jpeg") == True
+    assert server.compare_image(3, "mesh/polyhedrons/color.jpeg") == True
+
+def test_polyhedrons_visibility(server):
+
+    test_register_mesh(server)
+
+    server.call(VtkMeshPolyhedronsView.mesh_polyhedrons_prefix + VtkMeshPolyhedronsView.mesh_polyhedrons_schemas_dict["visibility"]["rpc"], [{"id": "123456789", "visibility": False}])
+    assert server.compare_image(3, "mesh/polyhedrons/visibility.jpeg") == True
+
+def test_vertex_attribute(server):
+
+    test_register_mesh(server)
+
+    server.call(VtkMeshPolyhedronsView.mesh_polyhedrons_prefix + VtkMeshPolyhedronsView.mesh_polyhedrons_schemas_dict["vertex_attribute"]["rpc"], [{"id": "123456789", "name": "toto_on_vertices"}])
+    assert server.compare_image(3, "mesh/polyhedrons/vertex_attribute.jpeg") == True
+
+
+def test_polyhedron_attribute(server):
+
+    test_register_mesh(server)
+
+    server.call(VtkMeshPolyhedronsView.mesh_polyhedrons_prefix + VtkMeshPolyhedronsView.mesh_polyhedrons_schemas_dict["polyhedron_attribute"]["rpc"], [{"id": "123456789", "name": "toto_on_polyhedra"}])
+    assert server.compare_image(3, "mesh/polyhedrons/polyhedron_attribute.jpeg") == True