passing tests

Author: JulienChampagnol

src/opengeodeweb_viewer/object/methods.py renamed to src/opengeodeweb_viewer/object/object_methods.py

@@ -39,11 +39,7 @@ def deregister(self, id):
         self.deregister_object(id)
         self.render()
 
-    
-    # @exportRpc(schemas_dict["apply_textures"]["rpc"])
     def applyTextures(self, id, textures):
-        # id = params["id"]
-        # textures = params["textures"]
         textures_array = []
         images_reader_array = []
 
@@ -104,12 +100,11 @@ def SetOpacity(self, id, opacity):
         self.render()
 
     def SetColor(self, id, red, green, blue):
-        color = [red, green, blue]
-        print(f"{color=}", flush=True)
+        reader = super().get_object(id)["reader"]
         mapper = self.get_object(id)["mapper"]
         mapper.ScalarVisibilityOff()
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetColor(color)
+        actor.GetProperty().SetColor([red, green, blue])
         self.render()
 
     def SetEdgeVisibility(self, id, visibility):

src/opengeodeweb_viewer/rpc/mesh/protocols.py renamed to src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -11,7 +11,7 @@
 
 # Local application imports
 from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
-from opengeodeweb_viewer.object.methods import VtkObjectView
+from opengeodeweb_viewer.object.object_methods import VtkObjectView
 
 
 schemas_dir = os.path.join(os.path.dirname(__file__), "schemas")
@@ -98,21 +98,25 @@ def setVertexAttribute(self, params):
         print(f"{params=}", flush=True)
         id = params["id"]
         name = params["name"]
+        reader = super().get_object(id)["reader"]
+        points = reader.GetOutput().GetPointData()
+        points.SetActiveScalars(name)
         mapper = super().get_object(id)["mapper"]
-        mapper.SelectColorArray(name)
         mapper.ScalarVisibilityOn()
-        mapper.SetScalarModeToUsePointFieldData()
+        mapper.SetScalarModeToUsePointData()
+        mapper.SetScalarRange(points.GetScalars().GetRange())
         super().render()
 
     @exportRpc(schemas_dict["display_polygon_attribute"]["rpc"])
     def setPolygonAttribute(self, params):
         validate_schema(params, schemas_dict["display_polygon_attribute"])
         id = params["id"]
         name = params["name"]
-        print(f"{id=}", flush=True)
-        print(f"{name=}", flush=True)
+        reader = super().get_object(id)["reader"]
+        cells = reader.GetOutput().GetCellData()
+        cells.SetActiveScalars(name)
         mapper = super().get_object(id)["mapper"]
-        mapper.SelectColorArray(name)
         mapper.ScalarVisibilityOn()
-        mapper.SetScalarModeToUseCellFieldData()
+        mapper.SetScalarModeToUseCellData()
+        mapper.SetScalarRange(cells.GetScalars().GetRange())
         super().render()

src/opengeodeweb_viewer/rpc/model/protocols.py renamed to src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -9,7 +9,7 @@
 
 # Local application imports
 from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
-from opengeodeweb_viewer.object.methods import VtkObjectView
+from opengeodeweb_viewer.object.object_methods import VtkObjectView
 
 schemas_dir = os.path.join(os.path.dirname(__file__), "schemas")
 schemas_dict = get_schemas_dict(schemas_dir)

src/opengeodeweb_viewer/rpc/viewer/protocols.py renamed to src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -24,17 +24,17 @@ def __init__(self):
     @exportRpc(schemas_dict["create_visualization"]["rpc"])
     def createVisualization(self, params):
         validate_schema(params, schemas_dict["create_visualization"])
-        renderWindow = self.getView("-1")
+        renderWindow = super().getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
         renderer.SetBackground([180 / 255, 180 / 255, 180 / 255])
         renderer.ResetCamera()
         renderWindow.Render()
-        self.render()
+        super().render()
 
     @exportRpc(schemas_dict["set_background_color"]["rpc"])
     def setBackgroundColor(self, params):
         validate_schema(params, schemas_dict["set_background_color"])
-        renderWindow = self.getView("-1")
+        renderWindow = super().getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
         red = params["red"]
         green = params["green"]
@@ -43,16 +43,16 @@ def setBackgroundColor(self, params):
         renderer.SetBackground([red, green, blue])
         renderer.ResetCamera()
         renderWindow.Render()
-        self.render()
+        super().render()
 
     @exportRpc(schemas_dict["reset_camera"]["rpc"])
     def resetCamera(self, params):
         print(f"{params=}", flush=True)
         validate_schema(params, schemas_dict["reset_camera"])
-        renderWindow = self.getView("-1")
+        renderWindow = super().getView("-1")
         renderWindow.GetRenderers().GetFirstRenderer().ResetCamera()
         renderWindow.Render()
-        self.render()
+        super().render()
 
     @exportRpc(schemas_dict["take_screenshot"]["rpc"])
     def takeScreenshot(self, params):
@@ -61,8 +61,8 @@ def takeScreenshot(self, params):
         filename = params["filename"]
         output_extension = params["output_extension"]
         include_background = params["include_background"]
-        renderWindow = self.getView("-1")
-        renderer = self.get_renderer()
+        renderWindow = super().getView("-1")
+        renderer = super().get_renderer()
 
         w2if = vtkWindowToImageFilter()
 
@@ -106,7 +106,7 @@ def updateData(self, params):
         print(f"{params=}", flush=True)
         id = params["id"]
 
-        data = self.get_object(id)
+        data = super().get_object(id)
         reader = data["reader"]
         reader.Update()
         mapper = data["mapper"]
@@ -120,7 +120,7 @@ def updateData(self, params):
             tag,
         )
         mapper.SetScalarRange(scalars.GetRange())
-        self.render()
+        super().render()
 
     @exportRpc(schemas_dict["get_point_position"]["rpc"])
     def getPointPosition(self, params):
@@ -129,12 +129,12 @@ def getPointPosition(self, params):
         y = float(params["y"])
         xyz = [x, y, 0.0]
         picker = vtk.vtkWorldPointPicker()
-        picker.Pick(xyz, self.get_renderer())
+        picker.Pick(xyz, super().get_renderer())
         ppos = picker.GetPickPosition()
         return {"x": ppos[0], "y": ppos[1], "z": ppos[2]}
 
     @exportRpc(schemas_dict["reset"]["rpc"])
     def reset(self, params):
         validate_schema(params, schemas_dict["reset"])
-        renderWindow = self.getView("-1")
+        renderWindow = super().getView("-1")
         renderWindow.GetRenderers().GetFirstRenderer().RemoveAllViewProps()

src/opengeodeweb_viewer/vtk_override_protocols.py

@@ -55,9 +55,9 @@ def pushRender(self, vId, ignoreAnimation = False):
         if reply["image"]:
             # depending on whether the app has encoding enabled:
             if self.decode:
-                reply["image"] = base64.standard_b64decode(reply["image"]);
+                reply["image"] = base64.standard_b64decode(reply["image"])
 
-            reply["image"] = self.addAttachment(reply["image"]);
+            reply["image"] = self.addAttachment(reply["image"])
             reply["format"] = "jpeg"
             # save mtime for next call.
             self.trackingViews[vId]["mtime"] = reply["mtime"]

src/opengeodeweb_viewer/vtk_protocol.py

@@ -9,6 +9,7 @@
 
 class VtkView(vtk_protocols.vtkWebProtocol):
     def __init__(self):
+        super().__init__()
         self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH")
         self.DataReader = vtk.vtkXMLPolyDataReader()
         self.ImageReader = vtk.vtkXMLImageDataReader()

src/opengeodeweb_viewer/vtkw_server.py

@@ -12,9 +12,9 @@
 # Local application imports
 from .config import *
 from .vtk_protocol import VtkView
-from .rpc.viewer.protocols import VtkViewerView
-from .rpc.mesh.protocols import VtkMeshView
-from .rpc.model.protocols import VtkModelView
+from .rpc.viewer.viewer_protocols import VtkViewerView
+from .rpc.mesh.mesh_protocols import VtkMeshView
+from .rpc.model.model_protocols import VtkModelView
 
 
 # =============================================================================