add curved wall capability

Author: Crowder44

src/ifcplus/api/built_element.py

@@ -37,6 +37,7 @@
 import ifcopenshell.util.representation
 from typing import cast
 import ifcplus.util.geometry
+import ifcplus.util.project
 
 BUILT_ELEMENT_FRAME_MEMBER = Literal["IfcBeam", "IfcColumn", "IfcMember"]
 
@@ -357,127 +358,250 @@ def create_2pt_wall(
     return wall
 
 
-# def create_curved_wall(
-#     point_of_curvature_2d: tuple[float, float],
-#     point_on_center_of_curvature_side_2d: tuple[float, float],
-#     point_of_tangency_2d: tuple[float, float],
-#     elevation: float,
-#     height: float,
-#     materials: list[ifcopenshell.entity_instance],
-#     thicknesses: list[float],
-#     wall: ifcopenshell.entity_instance | None = None,
-#     name: str | None = None,
-#     parent: ifcopenshell.entity_instance | None = None,
-#     place_object_relative_to_parent: bool = False,
-# ):
-#     """Add straight IfcWall with IfcMaterialLayerSetUsage based on two points in
-#     XY space."""
-
-#     ifc4_file = materials[0].file
-
-#     material_layer_set = ifcplus.api.material.add_material_layer_set(
-#         materials=materials,
-#         thicknesses=thicknesses,
-#         name=None,
-#         check_for_duplicate=True,
-#     )
-
-#     wall_type = ifcplus.api.element_type.add_element_type_for_material_layer_set(
-#         ifc_class="IfcWallType",
-#         material_layer_set=material_layer_set,
-#         name=material_layer_set.LayerSetName,
-#         check_for_duplicate=True,
-#     )
-
-#     if wall is None:
-#         wall = ifcopenshell.api.root.create_entity(
-#             file=ifc4_file,
-#             ifc_class="IfcWall",
-#             name=name,
-#             predefined_type="NOTDEFINED",
-#         )
-
-#     ifcopenshell.api.type.assign_type(
-#         file=ifc4_file,
-#         related_objects=[wall],
-#         relating_type=wall_type,
-#     )
-
-#     total_thickness = 0.0
-#     for material_layer in material_layer_set.MaterialLayers:
-#         total_thickness += material_layer.LayerThickness
-
-#     rel_associates_material = ifcopenshell.api.material.assign_material(
-#         file=ifc4_file,
-#         products=[wall],
-#         type="IfcMaterialLayerSetUsage",
-#         material=None,  # inferred from assigned IfcElementType
-#     )
-#     material_layer_set_usage = cast(
-#         ifcopenshell.entity_instance, rel_associates_material
-#     ).RelatingMaterial
-#     material_layer_set_usage.OffsetFromReferenceLine = -total_thickness / 2
-
-#     point_of_curvature_3d = (start_point_2d[0], start_point_2d[1], elevation)
-#     end_point_3d = (end_point_2d[0], end_point_2d[1], elevation)
-#     vector_from_start_point_to_end_point = np.array(end_point_3d) - np.array(
-#         start_point_3d
-#     )
-#     length = float(np.linalg.norm(vector_from_start_point_to_end_point))
-
-#     representation_item = ifcplus.api.geometry.add_extruded_area_solid(
-#         ifc4_file=ifc4_file,
-#         profile=ifcplus.api.profile.add_arbitrary_profile_with_or_without_voids(
-#             file=ifc4_file,
-#             outer_profile=[
-#                 (0.0, 0.0 - total_thickness / 2),
-#                 (0.0 + length, 0.0 - total_thickness / 2),
-#                 (0.0 + length, 0.0 + total_thickness - total_thickness / 2),
-#                 (0.0 + length - length, 0.0 + total_thickness - total_thickness / 2),
-#                 (0.0, 0.0 - total_thickness / 2),
-#             ],
-#             inner_profiles=[],
-#             name=None,
-#         ),
-#         extrusion_depth=height,
-#     )
-
-#     representation_type = ifcopenshell.util.representation.guess_type(
-#         items=[representation_item]
-#     )
-
-#     shape_model = ifcplus.api.geometry.add_shape_model(
-#         ifc4_file=ifc4_file,
-#         shape_model_class="IfcShapeRepresentation",
-#         representation_identifier="Body",
-#         representation_type=cast(str, representation_type),  # SweptSolid
-#         context_type="Model",
-#         target_view="MODEL_VIEW",
-#         items=[representation_item],
-#     )
-
-#     ifcopenshell.api.geometry.assign_representation(
-#         file=ifc4_file,
-#         product=wall,
-#         representation=shape_model,
-#     )
-
-#     if isinstance(parent, ifcopenshell.entity_instance):
-#         ifcopenshell.api.spatial.assign_container(
-#             file=ifc4_file,
-#             products=[wall],
-#             relating_structure=parent,
-#         )
-
-#     ifcplus.api.placement.edit_object_placement(
-#         product=wall,
-#         repositioned_origin=start_point_3d,
-#         repositioned_x_axis=tuple(vector_from_start_point_to_end_point.tolist()),
-#         repositioned_z_axis=(0.0, 0.0, 1.0),
-#         place_object_relative_to_parent=place_object_relative_to_parent,
-#     )
-
-#     return wall
+def create_curved_wall(
+    point_of_curvature_2d: tuple[float, float],
+    point_on_center_of_curvature_side_2d: tuple[float, float],
+    point_of_tangency_2d: tuple[float, float],
+    radius_of_curvature: float,
+    elevation: float,
+    height: float,
+    materials: list[ifcopenshell.entity_instance],
+    thicknesses: list[float],
+    wall: ifcopenshell.entity_instance | None = None,
+    name: str | None = None,
+    parent: ifcopenshell.entity_instance | None = None,
+    place_object_relative_to_parent: bool = False,
+):
+    """Add straight IfcWall with IfcMaterialLayerSetUsage based on two points in
+    XY space."""
+
+    ifc4_file = materials[0].file
+
+    numeric_scale = ifcplus.util.project.get_numeric_scale_of_project(
+        ifc4_file=ifc4_file,
+    )
+
+    material_layer_set = ifcplus.api.material.add_material_layer_set(
+        materials=materials,
+        thicknesses=thicknesses,
+        name=None,
+        check_for_duplicate=True,
+    )
+
+    wall_type = ifcplus.api.element_type.add_element_type_for_material_layer_set(
+        ifc_class="IfcWallType",
+        material_layer_set=material_layer_set,
+        name=material_layer_set.LayerSetName,
+        check_for_duplicate=True,
+    )
+
+    if wall is None:
+        wall = ifcopenshell.api.root.create_entity(
+            file=ifc4_file,
+            ifc_class="IfcWall",
+            name=name,
+            predefined_type="NOTDEFINED",
+        )
+
+    ifcopenshell.api.type.assign_type(
+        file=ifc4_file,
+        related_objects=[wall],
+        relating_type=wall_type,
+    )
+
+    total_thickness = 0.0
+    for material_layer in material_layer_set.MaterialLayers:
+        total_thickness += material_layer.LayerThickness
+
+    rel_associates_material = ifcopenshell.api.material.assign_material(
+        file=ifc4_file,
+        products=[wall],
+        type="IfcMaterialLayerSetUsage",
+        material=None,  # inferred from assigned IfcElementType
+    )
+    material_layer_set_usage = cast(
+        ifcopenshell.entity_instance, rel_associates_material
+    ).RelatingMaterial
+    material_layer_set_usage.OffsetFromReferenceLine = -total_thickness / 2
+
+    radius_of_curvature_for_middle_curve = radius_of_curvature
+    point_of_curvature_3d_for_middle_curve = (
+        point_of_curvature_2d[0],
+        point_of_curvature_2d[1],
+        elevation,
+    )
+    point_of_tangency_3d_for_middle_curve = (
+        point_of_tangency_2d[0],
+        point_of_tangency_2d[1],
+        elevation,
+    )
+    point_on_center_of_curvature_side_3d_for_middle_curve = (
+        point_on_center_of_curvature_side_2d[0],
+        point_on_center_of_curvature_side_2d[1],
+        elevation,
+    )
+
+    middle_horizontal_curve = ifcplus.util.geometry.HorizontalCurve.from_PC_and_PT_and_CC(
+        point_of_curvature=point_of_curvature_3d_for_middle_curve,
+        point_on_center_of_curvature_side=point_on_center_of_curvature_side_3d_for_middle_curve,
+        point_of_tangency=point_of_tangency_3d_for_middle_curve,
+        radius_of_curvature=radius_of_curvature_for_middle_curve,
+    )
+
+    point_of_center_of_curvature_3d_for_all_curves = (
+        middle_horizontal_curve.center_of_curvature
+    )
+
+    unit_vector_from_CC_to_PC = (
+        ifcplus.util.geometry.calculate_unit_direction_vector_between_two_points(
+            p1=point_of_center_of_curvature_3d_for_all_curves,
+            p2=point_of_curvature_3d_for_middle_curve,
+        )
+    )
+    unit_vector_from_CC_to_PT = (
+        ifcplus.util.geometry.calculate_unit_direction_vector_between_two_points(
+            p1=point_of_center_of_curvature_3d_for_all_curves,
+            p2=point_of_tangency_3d_for_middle_curve,
+        )
+    )
+
+    radius_of_curvature_for_inner_curve = (
+        radius_of_curvature_for_middle_curve - total_thickness / 2.0
+    )
+    point_of_curvature_3d_for_inner_curve = tuple(
+        (
+            np.array(point_of_center_of_curvature_3d_for_all_curves)
+            + np.array(unit_vector_from_CC_to_PC) * radius_of_curvature_for_inner_curve
+        ).tolist()
+    )
+    point_of_tangency_3d_for_inner_curve = tuple(
+        (
+            np.array(point_of_center_of_curvature_3d_for_all_curves)
+            + np.array(unit_vector_from_CC_to_PT) * radius_of_curvature_for_inner_curve
+        ).tolist()
+    )
+    inner_horizontal_curve = ifcplus.util.geometry.HorizontalCurve.from_PC_and_PT_and_CC(
+        point_of_curvature=point_of_curvature_3d_for_inner_curve,
+        point_on_center_of_curvature_side=point_of_center_of_curvature_3d_for_all_curves,
+        point_of_tangency=point_of_tangency_3d_for_inner_curve,
+        radius_of_curvature=radius_of_curvature_for_inner_curve,
+    )
+
+    radius_of_curvature_for_outer_curve = (
+        radius_of_curvature_for_middle_curve + total_thickness / 2.0
+    )
+    point_of_curvature_3d_for_outer_curve = tuple(
+        (
+            np.array(point_of_center_of_curvature_3d_for_all_curves)
+            + np.array(unit_vector_from_CC_to_PC) * radius_of_curvature_for_outer_curve
+        ).tolist()
+    )
+    point_of_tangency_3d_for_outer_curve = tuple(
+        (
+            np.array(point_of_center_of_curvature_3d_for_all_curves)
+            + np.array(unit_vector_from_CC_to_PT) * radius_of_curvature_for_outer_curve
+        ).tolist()
+    )
+    outer_horizontal_curve = ifcplus.util.geometry.HorizontalCurve.from_PC_and_PT_and_CC(
+        point_of_curvature=point_of_curvature_3d_for_outer_curve,
+        point_on_center_of_curvature_side=point_of_center_of_curvature_3d_for_all_curves,
+        point_of_tangency=point_of_tangency_3d_for_outer_curve,
+        radius_of_curvature=radius_of_curvature_for_outer_curve,
+    )
+
+    points_list_3d = [
+        inner_horizontal_curve.point_of_curvature,
+        outer_horizontal_curve.point_of_curvature,
+        outer_horizontal_curve.point_at_midpoint_of_curve,
+        outer_horizontal_curve.point_of_tangency,
+        inner_horizontal_curve.point_of_tangency,
+        inner_horizontal_curve.point_at_midpoint_of_curve,
+    ]
+
+    points_list_2d = []
+    for point_3d in points_list_3d:
+        point_3d_relative_to_PC_of_middle_curve = tuple(
+            np.round(
+                (
+                    np.array(point_3d)
+                    - np.array(middle_horizontal_curve.point_of_curvature)
+                ),
+                numeric_scale,
+            ).tolist()
+        )
+        points_list_2d.append(point_3d_relative_to_PC_of_middle_curve[0:2])
+
+    cartesian_point_list = ifc4_file.create_entity(
+        type="IfcCartesianPointList2D",
+        CoordList=points_list_2d,
+    )
+
+    indexed_polycurve = ifc4_file.create_entity(
+        type="IfcIndexedPolyCurve",
+        Points=cartesian_point_list,
+        Segments=[
+            ifc4_file.create_entity("IfcLineIndex", [1, 2]),
+            ifc4_file.create_entity("IfcArcIndex", [2, 3, 4]),
+            ifc4_file.create_entity("IfcLineIndex", [4, 5]),
+            ifc4_file.create_entity("IfcArcIndex", [5, 6, 1]),
+        ],
+        SelfIntersect=False,
+    )
+
+    arbitrary_closed_profile_def = ifc4_file.create_entity(
+        type="IfcArbitraryClosedProfileDef",
+        ProfileType="AREA",
+        ProfileName=name,
+        OuterCurve=indexed_polycurve,
+    )
+
+    extruded_area_solid = ifcplus.api.geometry.add_extruded_area_solid(
+        ifc4_file=ifc4_file,
+        profile=arbitrary_closed_profile_def,
+        extrusion_depth=height,
+    )
+
+    shape_representation = ifcplus.api.geometry.add_shape_model(
+        ifc4_file=ifc4_file,
+        shape_model_class="IfcShapeRepresentation",
+        representation_identifier="Body",
+        representation_type=cast(
+            str,
+            ifcopenshell.util.representation.guess_type(items=[extruded_area_solid]),
+        ),  # SweptSolid
+        context_type="Model",
+        target_view="MODEL_VIEW",
+        items=[extruded_area_solid],
+    )
+
+    ifcopenshell.api.geometry.assign_representation(
+        file=ifc4_file,
+        product=wall,
+        representation=shape_representation,
+    )
+
+    if isinstance(parent, ifcopenshell.entity_instance):
+        ifcopenshell.api.spatial.assign_container(
+            file=ifc4_file,
+            products=[wall],
+            relating_structure=parent,
+        )
+
+    unit_vector_from_PC_to_PI = (
+        ifcplus.util.geometry.calculate_unit_direction_vector_between_two_points(
+            p1=middle_horizontal_curve.point_of_curvature,
+            p2=middle_horizontal_curve.point_of_intersection,
+        )
+    )
+    ifcplus.api.placement.edit_object_placement(
+        product=wall,
+        repositioned_origin=middle_horizontal_curve.point_of_curvature,
+        repositioned_x_axis=unit_vector_from_PC_to_PI,
+        repositioned_z_axis=(0.0, 0.0, 1.0),
+        place_object_relative_to_parent=place_object_relative_to_parent,
+    )
+
+    return wall
 
 
 def create_npt_slab(

src/ifcplus/api/project.py

@@ -317,6 +317,8 @@ def write_to_ifc_spf(
 
     ifc4_file.write(file_path)
 
+    ifcopenshell.open
+
     if add_annotations:
         annotate_ifc_spf(file_path=file_path)