[ENH] Few changes reading meshes to liquid earth

Author: Leguark

tests/test_interfaces/test_liquid_earth.py

@@ -87,12 +87,13 @@ def test_dataset2(self, data_path):
 
         vertex, cells, cell_attr_int, cell_attr_map = dxf_to_mesh(path)
 
-        tri = trimesh.Trimesh(vertex, faces=cells)
+        tri = trimesh.Trimesh(vertex, faces=cells, face_attributes={"Shaft id": cell_attr_int})
 
         unstruct = subsurface.UnstructuredData.from_array(
             np.array(tri.vertices),
             np.array(tri.faces),
-            cells_attr=pandas.DataFrame(cell_attr_int, columns=["Shaft id"]),
+            cells_attr=pandas.DataFrame(np.array(tri.face_attributes["Shaft id"]),
+                                        columns=["Shaft id"]),
             xarray_attributes={"bounds": tri.bounds.tolist(),
                                "cell_attr_map": cell_attr_map
                                },
@@ -102,7 +103,7 @@ def test_dataset2(self, data_path):
         if True:
             trisurf = subsurface.TriSurf(unstruct)
             s = subsurface.visualization.to_pyvista_mesh(trisurf)
-            subsurface.visualization.pv_plot([s], image_2d=True)
+            subsurface.visualization.pv_plot([s], image_2d=False)
 
         return unstruct
 

tests/test_io/test_read_dxf.py

@@ -36,21 +36,63 @@ def test_read_dxf_into_mesh(data_path):
     import pandas
     vertex, cells, cell_attr_int, cell_attr_map = dxf_to_mesh(path)
 
-    tri = trimesh.Trimesh(vertex, faces=cells)
+    min = vertex.min(axis=0)
+    tri_array_shifted = vertex - min
+
+    tri = trimesh.Trimesh(tri_array_shifted, faces=cells, face_attributes={"Shaft id": cell_attr_int})
     print(tri.bounds)
     print(tri)
 
     unstruct = UnstructuredData.from_array(
         np.array(tri.vertices),
         np.array(tri.faces),
-        cells_attr=pandas.DataFrame(cell_attr_int, columns=["Shaft id"]),
+        cells_attr=pandas.DataFrame(np.array(tri.face_attributes["Shaft id"]),
+                                    columns=["Shaft id"]),
         xarray_attributes={"bounds": tri.bounds.tolist(),
                            "cell_attr_map": cell_attr_map
                            },
     )
-    #from subsurface.writer import base_structs_to_binary_file
-    #base_structs_to_binary_file("shafts", unstruct)
+    # from subsurface.writer import base_structs_to_binary_file
+    # base_structs_to_binary_file("full_sala", unstruct)
 
     ts = TriSurf(mesh=unstruct)
     s = sb_viz.to_pyvista_mesh(ts)
     sb_viz.pv_plot([s], image_2d=True)
+
+
+def test_read_dxf_into_mesh_split_by_bodies(data_path):
+    path = data_path + '/surfaces/shafts_small.dxf'
+    #path = "W:\FARMIN\DATA\Museum/sala_model_forth.dxf"
+    from subsurface.reader.mesh.surface_reader import dxf_to_mesh
+    import trimesh
+    import numpy as np
+    import pandas
+    vertex, cells, cell_attr_int, cell_attr_map = dxf_to_mesh(path)
+
+    tri_full = trimesh.Trimesh(vertex, faces=cells, face_attributes={"Shaft id": cell_attr_int})
+    prev_n_cells = 0
+
+    for e, tri in enumerate(tri_full.split()):
+        vertex = np.array(tri.vertices)
+        cells = np.array(tri.faces)
+
+        n_cells = cells.shape[0]
+        attr_ = tri_full.face_attributes["Shaft id"][prev_n_cells:prev_n_cells+n_cells]
+        prev_n_cells += n_cells
+
+        cells_attr = pandas.DataFrame(np.array(attr_), columns=["Shaft id"])
+
+        unstruct = UnstructuredData.from_array(
+            vertex,
+            cells,
+            cells_attr=cells_attr,
+            xarray_attributes={"bounds": tri.bounds.tolist(),
+                               "cell_attr_map": cell_attr_map
+                               },
+        )
+
+
+        ts = TriSurf(mesh=unstruct)
+        s = sb_viz.to_pyvista_mesh(ts)
+        sb_viz.pv_plot([s], image_2d=True)
+

tests/test_io/test_read_topography.py

@@ -1,5 +1,3 @@
-import pytest
-
 from subsurface import TriSurf, StructuredGrid
 from subsurface.reader import read_structured_topography, read_unstructured_topography
 from subsurface.structs.base_structures.common_data_utils import replace_outliers
@@ -15,6 +13,12 @@ def test_read_topography_from_dxf(data_path):
 
 
 def test_read_topography_from_tif(data_path):
+    """
+    Notes:
+        It needs rasterio/gdal
+
+
+    """
     topo_path = data_path + '/topo/dtm_rp.tif'
     struct = read_structured_topography(topo_path)
     replace_outliers(struct, 'topography', 0.99)

tests/test_structs/test_base_structures.py

@@ -137,6 +137,13 @@ def test_read_struct(data_path):
 
 
 def test_remove_outliers(data_path):
+    """
+     Notes:
+         It needs rasterio/gdal
+
+
+     """
+
     topo_path = data_path + '/topo/dtm_rp.tif'
     struct = read_structured_topography(topo_path)
     replace_outliers(struct, 'topography', 0.99)