edit pipe segments

Crowder44 · Crowder44 · commit 2b93cf62d380 · 2025-10-14T12:27:48.000-04:00
diff --git a/src/bim2fem/ifcplus/api/distribution_element.py b/src/bim2fem/ifcplus/api/distribution_element.py
@@ -198,8 +198,9 @@ def create_elbow(
 
 
 def create_pipe_segment(
-    p1: tuple[float, float, float],
-    p2: tuple[float, float, float],
+    ifc4_file: ifcopenshell.file,
+    start_point: tuple[float, float, float],
+    end_point: tuple[float, float, float],
     nominal_diameter: float,
     thickness: float,
     material: ifcopenshell.entity_instance,
@@ -211,8 +212,6 @@ def create_pipe_segment(
     add_shape_representation_to_ports: bool = False,
 ) -> ifcopenshell.entity_instance:
 
-    ifc4_file = material.file
-
     if pipe_segment is None:
         pipe_segment = ifcopenshell.api.root.create_entity(
             file=ifc4_file,
@@ -239,7 +238,7 @@ def create_pipe_segment(
             system=distribution_system,
         )
 
-    object_z_axis_in_global_coordinates = np.array(p2) - np.array(p1)
+    object_z_axis_in_global_coordinates = np.array(end_point) - np.array(start_point)
     angle_between_local_and_global_z_axes = (
         bim2fem.ifcplus.util.geometry.calculate_angle_between_two_vectors(
             vector1=tuple(object_z_axis_in_global_coordinates.tolist()),
@@ -298,7 +297,7 @@ def create_pipe_segment(
         representation=shape_model,
     )
 
-    object_origin_in_global_coordinates = p1
+    object_origin_in_global_coordinates = start_point
 
     bim2fem.ifcplus.api.placement.edit_object_placement(
         product=pipe_segment,
diff --git a/src/bim2fem/ifcplus/api/system.py b/src/bim2fem/ifcplus/api/system.py
@@ -9,7 +9,6 @@
 import bim2fem.ifcplus.util.geometry
 import bim2fem.ifcplus.api.style
 import numpy as np
-import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 from bim2fem.ifcplus.api.distribution_element import ELBOW_RADIUS_TYPE
 import bim2fem.ifcplus.util.system
@@ -19,6 +18,10 @@ def add_shape_representation_to_distribution_ports(
     ports: list[ifcopenshell.entity_instance],
     arrow_size: float = 0.1,
 ) -> None:
+    """Add ShapeRepresentation to DistributionPorts as RectangularPyramids pointing
+    in the direction of flow.
+    """
+
     ifc4_file = ports[0].file
 
     sink_arrow = None
@@ -96,52 +99,6 @@ def add_shape_representation_to_distribution_ports(
             )
 
 
-def filter_out_colinear_points_from_polyline(
-    polyline: list[tuple[float, float, float]],
-) -> list[tuple[float, float, float]]:
-
-    def remove_items_by_indices(lst: list, indices: list) -> list:
-        indices_set = set(indices)
-        return [item for idx, item in enumerate(lst) if idx not in indices_set]
-
-    if len(polyline) < 3:
-        return polyline
-
-    indices_of_points_to_remove = []
-
-    for index in range(len(polyline)):
-
-        if index == len(polyline) - 2:
-            break
-
-        p1 = polyline[index]
-        p2 = polyline[index + 1]
-        p3 = polyline[index + 2]
-
-        v12 = bim2fem.ifcplus.util.geometry.calculate_unit_direction_vector_between_two_points(
-            p1=p1,
-            p2=p2,
-        )
-
-        v23 = bim2fem.ifcplus.util.geometry.calculate_unit_direction_vector_between_two_points(
-            p1=p2,
-            p2=p3,
-        )
-
-        angle = bim2fem.ifcplus.util.geometry.calculate_angle_between_two_vectors(
-            vector1=v12, vector2=v23
-        )
-
-        if angle == 0.0:
-            indices_of_points_to_remove.append(index + 1)
-
-        new_polyine = remove_items_by_indices(
-            lst=polyline, indices=indices_of_points_to_remove
-        )
-
-    return new_polyine
-
-
 def create_piping_system_from_polyline(
     ifc4_file: ifcopenshell.file,
     polyline: list[tuple[float, float, float]],
@@ -163,8 +120,9 @@ def create_piping_system_from_polyline(
 
     if len(polyline) == 2:
         pipe_segment = bim2fem.ifcplus.api.distribution_element.create_pipe_segment(
-            p1=polyline[0],
-            p2=polyline[1],
+            ifc4_file=ifc4_file,
+            start_point=polyline[0],
+            end_point=polyline[1],
             nominal_diameter=nominal_diameter,
             thickness=thickness,
             material=material,
@@ -176,7 +134,9 @@ def create_piping_system_from_polyline(
         )
         return [pipe_segment]
 
-    polyline = filter_out_colinear_points_from_polyline(polyline=polyline)
+    polyline = bim2fem.ifcplus.util.geometry.filter_out_colinear_points_from_polyline(
+        polyline=polyline,
+    )
 
     if elbow_radius_type == "LONG":
         radius_of_curvature = 1.5 * nominal_diameter
@@ -192,8 +152,9 @@ def create_piping_system_from_polyline(
         if index + 2 == len(polyline):
             last_pipe_segment = (
                 bim2fem.ifcplus.api.distribution_element.create_pipe_segment(
-                    p1=pipe_segment_start_point,
-                    p2=polyline[-1],
+                    ifc4_file=ifc4_file,
+                    start_point=pipe_segment_start_point,
+                    end_point=polyline[-1],
                     nominal_diameter=nominal_diameter,
                     thickness=thickness,
                     material=material,
@@ -219,8 +180,9 @@ def create_piping_system_from_polyline(
         pipe_segment_end_point = horizontal_curve.point_of_curvature
 
         pipe_segment = bim2fem.ifcplus.api.distribution_element.create_pipe_segment(
-            p1=pipe_segment_start_point,
-            p2=pipe_segment_end_point,
+            ifc4_file=ifc4_file,
+            start_point=pipe_segment_start_point,
+            end_point=pipe_segment_end_point,
             nominal_diameter=nominal_diameter,
             thickness=thickness,
             material=material,
diff --git a/src/bim2fem/ifcplus/util/geometry.py b/src/bim2fem/ifcplus/util/geometry.py
@@ -1527,3 +1527,48 @@ def line_parallel_to_triangle_plane(
     is_coplanar = is_parallel and (dist <= dist_tol)
 
     return is_parallel, is_coplanar, angle_to_plane_deg
+
+
+def filter_out_colinear_points_from_polyline(
+    polyline: list[tuple[float, float, float]],
+) -> list[tuple[float, float, float]]:
+    """Filter out colinear points from 3D polyline"""
+
+    def remove_items_by_indices(lst: list, indices: list) -> list:
+        indices_set = set(indices)
+        return [item for idx, item in enumerate(lst) if idx not in indices_set]
+
+    if len(polyline) < 3:
+        return polyline
+
+    indices_of_points_to_remove = []
+
+    for index in range(len(polyline)):
+
+        if index == len(polyline) - 2:
+            break
+
+        p1 = polyline[index]
+        p2 = polyline[index + 1]
+        p3 = polyline[index + 2]
+
+        v12 = calculate_unit_direction_vector_between_two_points(
+            p1=p1,
+            p2=p2,
+        )
+
+        v23 = calculate_unit_direction_vector_between_two_points(
+            p1=p2,
+            p2=p3,
+        )
+
+        angle = calculate_angle_between_two_vectors(vector1=v12, vector2=v23)
+
+        if angle == 0.0:
+            indices_of_points_to_remove.append(index + 1)
+
+        new_polyline = remove_items_by_indices(
+            lst=polyline, indices=indices_of_points_to_remove
+        )
+
+    return new_polyline
diff --git a/tests/ifcplus/api/test_distribution_element.py b/tests/ifcplus/api/test_distribution_element.py
@@ -276,6 +276,75 @@ def test_add_elbows(
 
         assert len(logger.statements) == 0
 
+    def test_add_pipe_segments(
+        self,
+        ifc_file_with_ventilation_distribution_system: ifcopenshell.file,
+    ):
+
+        distribution_system = ifc_file_with_ventilation_distribution_system.by_type(
+            type="IfcDistributionSystem",
+            include_subtypes=False,
+        )[0]
+
+        site = ifc_file_with_ventilation_distribution_system.by_type(
+            type="IfcSite",
+            include_subtypes=False,
+        )[0]
+
+        material = bim2fem.ifcplus.api.material.add_material_with_structural_properties(
+            ifc4_file=ifc_file_with_ventilation_distribution_system,
+            name="Galvanized Steel",
+            category="steel",
+            mass_density=7850.0,
+            young_modulus=200.0e9,
+            poisson_ratio=0.3,
+            thermal_expansion_coefficient=1.2e-6,
+            check_for_duplicate=True,
+        )
+
+        bim2fem.ifcplus.api.distribution_element.create_pipe_segment(
+            ifc4_file=ifc_file_with_ventilation_distribution_system,
+            start_point=(1.0, 1.0, 0.0),
+            end_point=(1.0, 1.0 + 5.0, 0.0),
+            nominal_diameter=1.0,
+            thickness=0.10,
+            material=material,
+            name="Pipe #1",
+            spatial_element=site,
+            distribution_system=distribution_system,
+            place_object_relative_to_parent=False,
+            add_shape_representation_to_ports=False,
+        )
+
+        bim2fem.ifcplus.api.distribution_element.create_pipe_segment(
+            ifc4_file=ifc_file_with_ventilation_distribution_system,
+            start_point=(1.0, 1.0 + 8.0, 0.0),
+            end_point=(1.0, 1.0 + 5.0 + 8.0, 0.0 + 5.0),
+            nominal_diameter=1.0,
+            thickness=0.10,
+            material=material,
+            name="Pipe #2",
+            spatial_element=site,
+            distribution_system=distribution_system,
+            place_object_relative_to_parent=False,
+            add_shape_representation_to_ports=False,
+        )
+
+        output_path = str(OUTPUT_DIR_FOR_DISTRIBUTION_ELEMENT / "pipe_segments.ifc")
+        bim2fem.ifcplus.api.project.write_to_ifc_spf(
+            ifc4_file=ifc_file_with_ventilation_distribution_system,
+            file_path=output_path,
+            add_annotations=True,
+        )
+
+        logger = ifcopenshell.validate.json_logger()
+        ifcopenshell.validate.validate(output_path, logger, express_rules=True)
+        from pprint import pprint
+
+        pprint(logger.statements)
+
+        assert len(logger.statements) == 0
+
 
 class TestConnectEquipment:
 
