update applyTextures with texture_id from database entry

Author: MaxNumerique

src/opengeodeweb_viewer/config.py

@@ -19,7 +19,9 @@ def dev_config():
     if platform == "linux":
         os.environ["DATA_FOLDER_PATH"] = "/temp/OpenGeodeWeb_Data/"
     elif platform == "win32":
-        os.environ["DATA_FOLDER_PATH"] = os.path.join("OpenGeodeWeb_Data")
+        os.environ["DATA_FOLDER_PATH"] = os.path.join(
+            "C:/Users", os.getlogin(), "OpenGeodeWeb_Data"
+        )
     if not os.path.exists(os.environ.get("DATA_FOLDER_PATH")):
         os.mkdir(os.environ.get("DATA_FOLDER_PATH"))
 

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -112,24 +112,33 @@ def meshApplyTextures(self, params):
             params, self.mesh_schemas_dict["apply_textures"], self.mesh_prefix
         )
         data_id, textures_info = params["id"], params["textures"]
-        textures_data = []
+        self.applyTextures(data_id, textures_info)
+
+    def applyTextures(self, mesh_id: str, textures_info: list):
         for tex_info in textures_info:
             texture_id = tex_info["id"]
             texture_name = tex_info["texture_name"]
             texture_data = Data.get(texture_id)
-            if texture_data and texture_data.geode_object == "RasterImage2D":
-                textures_data.append(
-                    {"texture_name": texture_name, "texture_data": texture_data}
-                )
-        self.applyTextures(data_id, textures_data)
-
-    def applyTextures(self, mesh_id: str, textures_data: list):
-        for tex_info in textures_data:
-            texture_name = tex_info["texture_name"]
-            texture_data = tex_info["texture_data"]
-            self.apply_single_texture(
-                mesh_id, texture_data.viewable_file_name, texture_name
-            )
+            if not texture_data or texture_data.geode_object != "RasterImage2D":
+                continue
+            texture_file_path = self.get_data_file_path(texture_id)
+            texture_reader = vtk.vtkXMLImageDataReader()
+            texture_reader.SetFileName(texture_file_path)
+            texture_reader.Update()
+            texture = vtk.vtkTexture()
+            texture.SetInputConnection(texture_reader.GetOutputPort())
+            texture.InterpolateOn()
+            reader = self.get_object(mesh_id)["reader"]
+            output = reader.GetOutput()
+            point_data = output.GetPointData()
+            for i in range(point_data.GetNumberOfArrays()):
+                array = point_data.GetArray(i)
+                if array.GetName() == texture_name:
+                    point_data.SetTCoords(array)
+                    break
+            actor = self.get_object(mesh_id)["actor"]
+            actor.SetTexture(texture)
+        self.render()
 
     def displayAttributeOnVertices(self, data_id, name):
         reader = self.get_object(data_id)["reader"]

src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -42,11 +42,22 @@ def registerModel(self, params):
             _ = self.get_data(data_id)
             file_path = self.get_data_file_path(data_id)
 
-            reader, geometry, mapper, actor = self._build_model_pipeline(file_path)
+            reader = vtk.vtkXMLMultiBlockDataReader()
+            reader.SetFileName(file_path)
+            filter = vtk.vtkGeometryFilter()
+            filter.SetInputConnection(reader.GetOutputPort())
+            mapper = vtk.vtkCompositePolyDataMapper()
+            mapper.SetInputConnection(filter.GetOutputPort())
+            attributes = vtkCompositeDataDisplayAttributes()
+            mapper.SetCompositeDataDisplayAttributes(attributes)
+
+            actor = vtk.vtkActor()
+            actor.SetMapper(mapper)
+
             renderer = self.get_renderer()
             renderer.AddActor(actor)
 
-            self.register_object(data_id, reader, geometry, actor, mapper, {})
+            self.register_object(data_id, reader, filter, actor, mapper, {})
             self.get_object(data_id)["max_dimension"] = "default"
             renderWindow = self.getView("-1")
             renderer.ResetCamera()