Merge pull request #79 from Geode-solutions/next

No commit message

Author: JulienChampagnol

.github/workflows/CICD.yml

@@ -10,11 +10,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.9"
+          python-version: "3.12"
       - name: Test
         run: |
           pip install pytest pytest-xprocess
-          pip install https://www.vtk.org/files/release/9.3/vtk_osmesa-9.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+          pip install https://www.vtk.org/files/release/9.3/vtk_osmesa-9.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
           pip install -e .
           pytest
 

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.9.0"
+version = "1.9.1-rc.1"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },

src/opengeodeweb_viewer/object/object_methods.py

@@ -108,23 +108,35 @@ def SetColor(self, id, red, green, blue):
 
     def SetEdgesVisibility(self, id, visibility):
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetEdgeVisibility(visibility)
+        max_dimension = self.get_object(id)["max_dimension"]
+        if max_dimension == "edges":
+            self.SetVisibility(id, visibility)
+        else:
+            actor.GetProperty().SetEdgeVisibility(visibility)
         self.render()
 
-    def SetEdgesSize(self, id, size):
+    def SetEdgesWidth(self, id, width):
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetEdgeWidth(size)
+        actor.GetProperty().SetEdgeWidth(width)
         self.render()
 
     def SetEdgesColor(self, id, red, green, blue):
         actor = self.get_object(id)["actor"]
-        actor.GetProperty().SetEdgeColor([red / 255, green / 255, blue / 255])
+        max_dimension = self.get_object(id)["max_dimension"]
+        if max_dimension == "edges":
+            self.SetColor(id, red, green, blue)
+        else:
+            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)
-        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):
@@ -134,7 +146,11 @@ def SetPointsSize(self, id, size):
 
     def SetPointsColor(self, id, red, green, blue):
         actor = self.get_object(id)["actor"]
-        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/mesh/edges/mesh_edges_protocols.py

@@ -39,10 +39,10 @@ def setMeshEdgesColor(self, params):
         )
         self.SetEdgesColor(id, red, green, blue)
 
-    @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["size"]["rpc"])
-    def setMeshEdgesSize(self, params):
+    @exportRpc(mesh_edges_prefix + mesh_edges_schemas_dict["width"]["rpc"])
+    def setMeshEdgesWidth(self, params):
         validate_schema(
-            params, self.mesh_edges_schemas_dict["size"], self.mesh_edges_prefix
+            params, self.mesh_edges_schemas_dict["width"], self.mesh_edges_prefix
         )
-        id, size = params["id"], params["size"]
-        self.SetEdgesSize(id, size)
+        id, size = params["id"], params["width"]
+        self.SetEdgesWidth(id, width)

src/opengeodeweb_viewer/rpc/mesh/edges/schemas/width.json

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

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -29,6 +29,27 @@ def registerMesh(self, params):
             mapper = vtk.vtkDataSetMapper()
             mapper.SetInputConnection(reader.GetOutputPort())
             self.registerObject(id, file_name, reader, filter, mapper)
+
+            data_object = reader.GetOutput()
+            data_set = vtk.vtkDataSet.SafeDownCast(data_object)
+            cell_types = vtk.vtkCellTypes()
+            data_set.GetCellTypes(cell_types)
+            cell_data = cell_types.GetCellTypesArray()
+            max_id = -1
+            for t in range(cell_data.GetSize()):
+                t_id = cell_data.GetValue(t)
+                max_id = max(max_id, t_id)
+            print(f"{max_id=}", flush=True)
+            max_dimension = ""
+            if max_id < 3:
+                max_dimension = "points"
+            elif max_id < 5:
+                max_dimension = "edges"
+            elif max_id < 7:
+                max_dimension = "polygons"
+            elif max_id >= 7:
+                max_dimension = "polyhedra"
+            self.get_data_base()[id]["max_dimension"] = max_dimension
         except Exception as e:
             print("error : ", str(e), flush=True)