tests viewer okay

Author: JulienChampagnol

src/opengeodeweb_viewer/object/methods.py

@@ -1,5 +1,5 @@
 # Standard library imports
-
+import os
 
 # Third party imports
 

src/opengeodeweb_viewer/object/schemas/set_edge_visibility.json

@@ -0,0 +1,16 @@
+{
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "visibility": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "id",
+    "visibility"
+  ],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/object/schemas/set_point_size.json

@@ -0,0 +1,16 @@
+{
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "size": {
+      "type": "number"
+    }
+  },
+  "required": [
+    "id",
+    "size"
+  ],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/object/schemas/set_vertex_visility.json

@@ -0,0 +1,16 @@
+{
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    },
+    "visibility": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "id",
+    "visibility"
+  ],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/object/schemas/set_visibility.json

@@ -0,0 +1,16 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "visibility": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "visibility"
+    ],
+    "additionalProperties": false
+}

src/opengeodeweb_viewer/rpc/mesh/protocols.py

@@ -11,7 +11,7 @@
 
 # Local application imports
 from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
-from opengeodeweb_viewer.vtk_protocol import VtkView
+from opengeodeweb_viewer.object.methods import VtkObjectView
 
 
 schemas_dir = os.path.join(os.path.dirname(__file__), "schemas")
@@ -23,35 +23,38 @@ def __init__(self):
 
     @exportRpc(schemas_dict["toggle_object_visibility"]["rpc"])
     def toggle_object_visibility(self, params):
-        print(f"{schemas_dict["toggle_object_visibility"]["rpc"]=}", flush=True)
+        print(schemas_dict["toggle_object_visibility"]["rpc"], flush=True)
         validate_schema(params, schemas_dict["toggle_object_visibility"])
         super().SetVisibility(params)
 
     @exportRpc(schemas_dict["set_opacity"]["rpc"])
     def SetOpacity(self, params):
-        print(f"{schemas_dict["set_opacity"]["rpc"]=}", flush=True)
+        print(schemas_dict["set_opacity"]["rpc"], flush=True)
         validate_schema(params, schemas_dict["set_opacity"])
         super().SetOpacity(params)
 
     @exportRpc(schemas_dict["toggle_edge_visibility"]["rpc"])
     def setEdgeVisibility(self, params):
-        print(f"{schemas_dict["toggle_edge_visibility"]["rpc"]=}", flush=True)
+        print(schemas_dict["toggle_edge_visibility"]["rpc"], flush=True)
         validate_schema(params, schemas_dict["toggle_edge_visibility"])
         print(f"{params=}", flush=True)
         super().SetEdgeVisibility(params)
 
     @exportRpc(schemas_dict["toggle_point_visibility"]["rpc"])
     def setPointVisibility(self, params):
+        print(schemas_dict["toggle_point_visibility"]["rpc"], flush=True)
         validate_schema(params, schemas_dict["toggle_point_visibility"])
         super().SetVertexVisibility(params)
 
     @exportRpc(schemas_dict["set_point_size"]["rpc"])
     def setPointSize(self, params):
+        print(schemas_dict["set_point_size"]["rpc"], flush=True)
         validate_schema(params, schemas_dict["set_point_size"])
         super().SetPointSize(params)
 
     @exportRpc(schemas_dict["set_color"]["rpc"])
     def setColor(self, params):
+        print(schemas_dict["set_color"]["rpc"], flush=True)
         validate_schema(params, schemas_dict["set_color"])
         super().SetColor(params)
 
@@ -69,7 +72,7 @@ def setVertexAttribute(self, params):
 
     @exportRpc(schemas_dict["display_polygon_attribute"]["rpc"])
     def setPolygonAttribute(self, id, name):
-        store = self.getObject(id)
+        validate_schema(params, schemas_dict["display_polygon_attribute"])
         cpp = store["cpp"]
         print(cpp.nb_polygons())
         cells = store["vtk"].GetCellData()
@@ -81,7 +84,7 @@ def setPolygonAttribute(self, id, name):
             data = self.computeAttributeData(manager, name)
             cells.AddArray(data)
         cells.SetActiveScalars(name)
-        mapper = store["mapper"]
+        mapper = self.get_object(id)["mapper"]
         mapper.ScalarVisibilityOn()
         mapper.SetScalarModeToUseCellData()
         mapper.SetScalarRange(cells.GetScalars().GetRange())

src/opengeodeweb_viewer/rpc/viewer/protocols.py

@@ -22,7 +22,7 @@ def __init__(self):
         super().__init__()
 
     @exportRpc(schemas_dict["create_visualization"]["rpc"])
-    def create_visualization(self, params):
+    def createVisualization(self, params):
         validate_schema(params, schemas_dict["create_visualization"])
         renderWindow = self.getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
@@ -32,7 +32,7 @@ def create_visualization(self, params):
         self.render()
 
     @exportRpc(schemas_dict["set_viewer_background_color"]["rpc"])
-    def set_viewer_background_color(self, params):
+    def setViewerBackgroundColor(self, params):
         validate_schema(params, schemas_dict["set_viewer_background_color"])
         renderWindow = self.getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
@@ -46,7 +46,7 @@ def set_viewer_background_color(self, params):
         self.render()
 
     @exportRpc(schemas_dict["reset_camera"]["rpc"])
-    def reset_camera(self, params):
+    def resetCamera(self, params):
         print(f"{params=}", flush=True)
         validate_schema(params, schemas_dict["reset_camera"])
         renderWindow = self.getView("-1")
@@ -55,7 +55,7 @@ def reset_camera(self, params):
         self.render()
 
     @exportRpc(schemas_dict["create_object_pipeline"]["rpc"])
-    def create_object_pipeline(self, params):
+    def createObjectPipeline(self, params):
         validate_schema(params, schemas_dict["create_object_pipeline"])
         try:
             id = params["id"]
@@ -95,7 +95,7 @@ def create_object_pipeline(self, params):
             print("error : ", str(e), flush=True)
 
     @exportRpc(schemas_dict["delete_object_pipeline"]["rpc"])
-    def delete_object_pipeline(self, params):
+    def deleteObjectPipeline(self, params):
         validate_schema(params, schemas_dict["delete_object_pipeline"])
         print(f"{params=}", flush=True)
         id = params["id"]
@@ -112,7 +112,6 @@ def delete_object_pipeline(self, params):
 
     @exportRpc(schemas_dict["take_screenshot"]["rpc"])
     def takeScreenshot(self, params):
-        self.__init__()
         validate_schema(params, schemas_dict["take_screenshot"])
         print(f"{params=}", flush=True)
         filename = params["filename"]
@@ -160,7 +159,7 @@ def takeScreenshot(self, params):
 
 
     @exportRpc(schemas_dict["apply_textures"]["rpc"])
-    def apply_textures(self, params):
+    def applyTextures(self, params):
         validate_schema(params, schemas_dict["apply_textures"])
         print(f"{params=}", flush=True)
         id = params["id"]
@@ -214,7 +213,7 @@ def apply_textures(self, params):
         self.render()
 
     @exportRpc(schemas_dict["update_data"]["rpc"])
-    def update_data(self, params):
+    def updateData(self, params):
         validate_schema(params, schemas_dict["update_data"])
         print(f"{params=}", flush=True)
         id = params["id"]
@@ -236,7 +235,7 @@ def update_data(self, params):
         self.render()
 
     @exportRpc(schemas_dict["get_point_position"]["rpc"])
-    def get_point_position(self, params):
+    def getPointPosition(self, params):
         validate_schema(params, schemas_dict["get_point_position"])
         x = float(params["x"])
         y = float(params["y"])

src/tests/conftest.py

@@ -126,6 +126,7 @@ def get_xprocess_args(self):
         class Starter(ProcessStarter):
             terminate_on_interrupt = True
             pattern = "wslink: Starting factory"
+            timeout = 5
 
             # command to start process
             args = [