color methods harmonization

Author: JulienChampagnol

src/opengeodeweb_viewer/object/object_methods.py

@@ -88,7 +88,6 @@ def applyTextures(self, id, textures):
 
         self.render()
 
-
     def SetVisibility(self, id, visibility):
         actor = self.get_object(id)["actor"]
         actor.SetVisibility(visibility)
@@ -103,7 +102,7 @@ def SetColor(self, id, red, green, blue):
         mapper = self.get_object(id)["mapper"]
         mapper.ScalarVisibilityOff()
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetColor([red, green, blue])
+        actor.GetProperty().SetColor([red/255, green/255, blue/255])
         self.render()
 
     def SetEdgesVisibility(self, id, visibility):
@@ -116,10 +115,11 @@ def SetEdgesSize(self, id, size):
         actor.GetProperty().SetEdgeWidth(size)
         self.render()
 
-    def SetEdgesColor(self, id, color):
+    def SetEdgesColor(self, id, red, green, blue):
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetEdgeColor(color)
+        actor.GetProperty().SetEdgeColor([red/255, green/255, blue/255])
         self.render()
+
     def SetPointsVisibility(self, id, visibility):
         actor = self.get_object(id)["actor"]
         actor.GetProperty().SetVertexVisibility(visibility)
@@ -131,35 +131,11 @@ def SetPointsSize(self, id, size):
         actor.GetProperty().SetPointSize(size)
         self.render()
 
-    def SetPointsColor(self, id, color):
+    def SetPointsColor(self, id, red, green, blue):
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetVertexColor(color)
+        actor.GetProperty().SetVertexColor([red/255, green/255, blue/255])
         self.render()
 
-    def SetPolygonsVisibility(self, id, visibility):
-        actor = self.get_object(id)["actor"]
-        actor.SetVisibility(visibility)
-        self.render()
-
-
-    def SetPolygonsColor(self, id, color):
-        actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetColor(color)
-        self.render()
-
-    def SetPolyhedronsVisibility(self, id, visibility):
-        actor = self.get_object(id)["actor"]
-        actor.SetVisibility(visibility)
-        self.render()
-    
-    def SetPolyhedronsColor(self, id, color):
-        reader = self.get_object(id)["reader"]
-        cells = reader.GetOutput().GetCellData()
-        mapper = self.get_object(id)["mapper"]
-        mapper.ScalarVisibilityOff()
-        cells.SetColor(color)
-        
-
     def clearColors(self, id):
         db = self.get_object(id)
         mapper = db["mapper"]

src/opengeodeweb_viewer/rpc/mesh/edges/edges_protocols.py

@@ -28,8 +28,8 @@ def setMeshEdgesColor(self, params):
         print(self.mesh_edges_prefix + self.mesh_edges_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
         validate_schema(params, self.mesh_edges_schemas_dict["color"])
         id = params["id"]
-        red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255
-        self.SetEdgesColor(id, [red, green, blue])
+        red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
+        self.SetEdgesColor(id, red, green, blue)
 
     @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["size"]["rpc"])
     def setMeshEdgesSize(self, params):

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -59,7 +59,7 @@ def setMeshColor(self, params):
         print(self.mesh_prefix + self.mesh_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
         validate_schema(params, self.mesh_schemas_dict["color"])
         id = params["id"]
-        red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255
+        red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
         self.SetColor(id, red, green, blue)
 
     def setMeshVertexAttribute(self, id, name):

src/opengeodeweb_viewer/rpc/mesh/points/points_protocols.py

@@ -28,8 +28,8 @@ def setMeshPointsColor(self, params):
         print(self.mesh_points_prefix + self.mesh_points_schemas_dict["color"]["rpc"], f"{params=}", flush=True)
         validate_schema(params, self.mesh_points_schemas_dict["color"])
         id = str(params["id"])
-        red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255
-        self.SetPointsColor(id, [red, green, blue])
+        red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
+        self.SetPointsColor(id, red, green, blue)
 
     @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["size"]["rpc"])
     def setMeshPointsSize(self, params):

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

@@ -21,15 +21,15 @@ def setMeshPolygonsVisibility(self, params):
         validate_schema(params, self.mesh_polygons_schemas_dict["visibility"])
         id = params["id"]
         visibility = bool(params["visibility"])
-        self.SetPolygonsVisibility(id, 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)
         validate_schema(params, self.mesh_polygons_schemas_dict["color"])
         id = params["id"]
-        red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255
-        self.SetPolygonsColor(id, [red, green, blue])
+        red, green, blue = params["color"]["r"], params["color"]["g"], params["color"]["b"]
+        self.SetColor(id, red, green, blue)
 
     @exportRpc(mesh_polygons_prefix + mesh_polygons_schemas_dict["vertex_attribute"]["rpc"])
     def setMeshPolygonsVertexAttribute(self, params):

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

@@ -15,13 +15,13 @@ class VtkMeshPolyhedronsView(VtkMeshView):
     def __init__(self):
         super().__init__()
 
-    # @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["visibility"]["rpc"])
-    # def setMeshPolyhedronsVisibility(self, params):
-    #     print(self.mesh_polyhedrons_prefix + self.mesh_polyhedrons_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
-    #     validate_schema(params, self.mesh_polyhedrons_schemas_dict["visibility"])
-    #     id = params["id"]
-    #     visibility = bool(params["visibility"])
-    #     self.SetPolyhedronsVisibility(id, visibility)
+    @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["visibility"]["rpc"])
+    def setMeshPolyhedronsVisibility(self, params):
+        print(self.mesh_polyhedrons_prefix + self.mesh_polyhedrons_schemas_dict["visibility"]["rpc"], f"{params=}", flush=True)
+        validate_schema(params, self.mesh_polyhedrons_schemas_dict["visibility"])
+        id = params["id"]
+        visibility = bool(params["visibility"])
+        self.SetVisibility(id, visibility)
 
     @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["color"]["rpc"])
     def setMeshPolyhedronsColor(self, params):
@@ -30,7 +30,7 @@ def setMeshPolyhedronsColor(self, params):
         print("id", params["id"], flush=True)
         id = params["id"]
         print("color", params["color"], flush=True)
-        red, green, blue = params["color"]["r"]/255, params["color"]["g"]/255, params["color"]["b"]/255
+        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"])
@@ -41,10 +41,3 @@ def setMeshPolyhedronsColor(self, params):
     #     name = str(params["name"])
     #     self.setMeshVertexAttribute(id, name)
 
-    # @exportRpc(mesh_polyhedrons_prefix + mesh_polyhedrons_schemas_dict["polygon_attribute"]["rpc"])
-    # def setMeshPolyhedronsPolygonAttribute(self, params):
-    #     print(self.mesh_polyhedrons_prefix + self.mesh_polyhedrons_schemas_dict["polygon_attribute"]["rpc"], f"{params=}", flush=True)
-    #     validate_schema(params, self.mesh_polyhedrons_schemas_dict["polygon_attribute"])
-    #     id = params["id"]
-    #     name = str(params["name"])
-    #     self.setMeshPolygonAttribute(id, name)