Merge pull request #49 from zasexton/main

falling back to non-parallel tube generation and unbalanced model

Author: zasexton

svv/tree/export/export_solid.py

@@ -459,7 +459,7 @@ def generate_polylines(xyz, r, num=1000):
     return polylines
 
 
-def generate_tube(polyline, hsize=None, radius_based=False):
+def generate_tube(polyline, hsize=None, radius_based=True):
     """
     This function generates a tube from a given polyline representing a single vessel of a
     vascular object (tree or forest).
@@ -729,8 +729,10 @@ def build_watertight_solid(tree, cap_resolution=40):
     """
     xyz, r, _, _, branches, _ = get_interpolated_sv_data(tree.data)
     lines = generate_polylines(xyz, r)
-    tubes = generate_tubes_parallel(lines, radius_based=True)
+    tubes = generate_tubes(lines)
     model = union_tubes(tubes, lines, cap_resolution=cap_resolution)
+    #tubes = generate_tubes_parallel(lines, radius_based=True)
+    #model = union_tubes_balanced(tubes, lines, cap_resolution=cap_resolution)
     # Remove poor quality elements and repair the mesh.
     cell_quality = model.compute_cell_quality(quality_measure='scaled_jacobian')
     keep = cell_quality.cell_data["CellQuality"] > 0.1