fix(edges & points): color & visibility on actor

Author: JulienChampagnol

src/opengeodeweb_viewer/object/object_methods.py

@@ -111,8 +111,7 @@ def SetEdgesVisibility(self, id, visibility):
         max_dimension = self.get_object(id)["max_dimension"]
         if max_dimension == "edges":
             self.SetVisibility(id, visibility)
-        else: 
-
+        else:
             actor.GetProperty().SetEdgeVisibility(visibility)
         self.render()
 
@@ -128,17 +127,17 @@ def SetEdgesColor(self, id, red, green, blue):
         if max_dimension == "edges":
             self.SetColor(id, red, green, blue)
         else: 
-        # actor.GetProperty().SetEdgeColor([red / 255, green / 255, blue / 255])
+            actor.GetProperty().SetEdgeColor([red / 255, green / 255, blue / 255])
         self.render()
 
     def SetPointsVisibility(self, id, visibility):
         actor = self.get_object(id)["actor"]
-        # max_dimension = self.get_object(id)["max_dimension"]
-        # if max_dimension == "points":
-        #     self.SetVisibility(id, visibility)
-        # else: 
-        actor.GetProperty().SetVertexVisibility(visibility)
-        actor.GetProperty().SetEdgeVisibility(visibility)
+        max_dimension = self.get_object(id)["max_dimension"]
+        if max_dimension == "points":
+            self.SetVisibility(id, visibility)
+        else: 
+            actor.GetProperty().SetVertexVisibility(visibility)
+            actor.GetProperty().SetEdgeVisibility(visibility)
         self.render()
 
     def SetPointsSize(self, id, size):
@@ -148,11 +147,11 @@ def SetPointsSize(self, id, size):
 
     def SetPointsColor(self, id, red, green, blue):
         actor = self.get_object(id)["actor"]
-        # max_dimension = self.get_object(id)["max_dimension"]
-        # if max_dimension == "points":
-        #     self.SetColor(id, red, green, blue)
-        # else: 
-        actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255])
+        max_dimension = self.get_object(id)["max_dimension"]
+        if max_dimension == "points":
+            self.SetColor(id, red, green, blue)
+        else:
+            actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255])
         self.render()
 
     def SetBlocksVisibility(self, id, block_ids, visibility):

src/opengeodeweb_viewer/rpc/model/blocks/blocks_protocols.py renamed to src/opengeodeweb_viewer/rpc/model/blocks/model_blocks_protocols.py

@@ -33,6 +33,7 @@ def registerModel(self, params):
             attributes = vtkCompositeDataDisplayAttributes()
             mapper.SetCompositeDataDisplayAttributes(attributes)
             self.registerObject(id, file_name, reader, filter, mapper)
+            self.get_object(id)["max_dimension"] = "dummy"
         except Exception as e:
             print("error : ", str(e), flush=True)
 

src/opengeodeweb_viewer/rpc/model/corners/corners_protocols.py renamed to src/opengeodeweb_viewer/rpc/model/corners/model_corners_protocols.py

@@ -18,22 +18,22 @@
 from .rpc.mesh.polygons.polygons_protocols import VtkMeshPolygonsView
 from .rpc.mesh.polyhedra.polyhedra_protocols import VtkMeshPolyhedraView
 from .rpc.model.model_protocols import VtkModelView
-from .rpc.model.edges.edges_protocols import (
+from .rpc.model.edges.model_edges_protocols import (
     VtkModelEdgesView,
 )
-from .rpc.model.points.points_protocols import (
+from .rpc.model.points.model_points_protocols import (
     VtkModelPointsView,
 )
-from .rpc.model.corners.corners_protocols import (
+from .rpc.model.corners.model_corners_protocols import (
     VtkModelCornersView,
 )
-from .rpc.model.lines.lines_protocols import (
+from .rpc.model.lines.model_lines_protocols import (
     VtkModelLinesView,
 )
-from .rpc.model.surfaces.surfaces_protocols import (
+from .rpc.model.surfaces.model_surfaces_protocols import (
     VtkModelSurfacesView,
 )
-from .rpc.model.blocks.blocks_protocols import (
+from .rpc.model.blocks.model_blocks_protocols import (
     VtkModelBlocksView,
 )
 from .rpc.generic.generic_protocols import VtkGenericView