update opening element

Author: Crowder44

src/ifcplus/api/built_element.py

@@ -169,7 +169,7 @@ def create_3pt_beam_or_column_or_member(
 
 def create_opening_element(
     voided_element: ifcopenshell.entity_instance,
-    profile_points: list[tuple[float, float]],  # 2D profile in XY coords of opening
+    profile: ifcopenshell.entity_instance,
     depth: float,  # Extrusion depth in the local z direction of the opening element
     origin_relative_to_voided_element: tuple[float, float, float] = (0.0, 0.0, 0.0),
     z_axis_relative_to_voided_element: tuple[float, float, float] = (0.0, 0.0, 1.0),
@@ -178,59 +178,62 @@ def create_opening_element(
 
     ifc4_file = voided_element.file
 
-    # Create Element
     opening_element = ifcopenshell.api.root.create_entity(
         file=ifc4_file,
         ifc_class="IfcOpeningElement",
         name=None,
         predefined_type=None,
     )
-    ifcplus.api.placement.edit_object_placement(
-        product=opening_element,
-        place_object_relative_to_parent=False,
-    )
-    opening_element.ObjectPlacement.PlacementRelTo = voided_element.ObjectPlacement
 
-    # Add Profile
-    profile = ifcplus.api.profile.add_arbitrary_profile_with_or_without_voids(
-        file=ifc4_file,
-        outer_profile=profile_points,
-        inner_profiles=[],
-        name=None,
-    )
-
-    # Add and Assign Representation
     representation_item = ifcplus.api.geometry.add_extruded_area_solid(
         ifc4_file=ifc4_file,
         profile=profile,
         extrusion_depth=depth,
-        repositioned_origin=origin_relative_to_voided_element,
-        repositioned_x_axis=x_axis_relative_to_voided_element,
-        repositioned_z_axis=z_axis_relative_to_voided_element,
+        # repositioned_origin=origin_relative_to_voided_element,
+        # repositioned_x_axis=x_axis_relative_to_voided_element,
+        # repositioned_z_axis=z_axis_relative_to_voided_element,
+    )
+
+    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="SweptSolid",
+        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=opening_element,
         representation=shape_model,
     )
 
-    # Void Relationship
     rel_voids_element = ifcopenshell.api.root.create_entity(
         file=ifc4_file,
         ifc_class="IfcRelVoidsElement",
     )
     rel_voids_element.RelatingBuildingElement = voided_element
     rel_voids_element.RelatedOpeningElement = opening_element
 
+    ifcplus.api.placement.edit_object_placement(
+        product=opening_element,
+        place_object_relative_to_parent=False,
+    )
+    opening_element.ObjectPlacement.PlacementRelTo = voided_element.ObjectPlacement
+    opening_element.ObjectPlacement.RelativePlacement = (
+        ifc4_file.createIfcAxis2Placement3D(
+            ifc4_file.createIfcCartesianPoint(origin_relative_to_voided_element),
+            ifc4_file.createIfcDirection(z_axis_relative_to_voided_element),
+            ifc4_file.createIfcDirection(x_axis_relative_to_voided_element),
+        )
+    )
+
     return opening_element
 
 
@@ -301,7 +304,7 @@ def create_2pt_wall(
     )
     length = float(np.linalg.norm(vector_from_start_point_to_end_point))
 
-    extruded_area_solid = ifcplus.api.geometry.add_extruded_area_solid(
+    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,
@@ -319,7 +322,7 @@ def create_2pt_wall(
     )
 
     representation_type = ifcopenshell.util.representation.guess_type(
-        items=[extruded_area_solid]
+        items=[representation_item]
     )
 
     shape_model = ifcplus.api.geometry.add_shape_model(
@@ -329,7 +332,7 @@ def create_2pt_wall(
         representation_type=cast(str, representation_type),  # SweptSolid
         context_type="Model",
         target_view="MODEL_VIEW",
-        items=[extruded_area_solid],
+        items=[representation_item],
     )
 
     ifcopenshell.api.geometry.assign_representation(

tests/ifcplus/api/test_built_element.py

@@ -109,3 +109,145 @@ def test_add_straight_walls(
 
         pprint(logger.statements)
         assert len(logger.statements) == 0
+
+    def test_add_straight_walls_with_openings(
+        self,
+    ):
+
+        ifc4_file = ifcplus.api.project.create_ifc4_file(
+            model_view_definition="ReferenceView_V1.2",
+            precision=1e-4,
+        )
+
+        project = ifc4_file.by_type(
+            type="IfcProject",
+            include_subtypes=False,
+        )[0]
+
+        site = ifcopenshell.api.root.create_entity(
+            file=ifc4_file,
+            ifc_class="IfcSite",
+            name="Site-01",
+        )
+        ifcopenshell.api.aggregate.assign_object(
+            file=ifc4_file,
+            products=[site],
+            relating_object=project,
+        )
+        ifcplus.api.placement.edit_object_placement(
+            product=site,
+            repositioned_origin=(1.0, 1.0, 0.0),
+            place_object_relative_to_parent=True,
+        )
+
+        concrete_material = ifcplus.api.material.add_material_from_standard_library(
+            ifc4_file=ifc4_file,
+            region="Europe",
+            material_name="C35/45",
+            check_for_duplicate=True,
+        )
+
+        steel_material = ifcplus.api.material.add_material_from_standard_library(
+            ifc4_file=ifc4_file,
+            region="Europe",
+            material_name="S355",
+            check_for_duplicate=True,
+        )
+
+        wall_1 = ifcplus.api.built_element.create_2pt_wall(
+            start_point_2d=(1.0, 1.0),
+            end_point_2d=(7.0, 1.0),
+            elevation=0.0,
+            height=3.0,
+            materials=[
+                cast(ifcopenshell.entity_instance, concrete_material),
+                cast(ifcopenshell.entity_instance, steel_material),
+                cast(ifcopenshell.entity_instance, concrete_material),
+            ],
+            thicknesses=[0.10, 0.10, 0.20],
+            name="Wall-01",
+            parent=site,
+            place_object_relative_to_parent=True,
+        )
+
+        opening_depth = 0.10 + 0.10 + 0.20
+
+        ifcplus.api.built_element.create_opening_element(
+            voided_element=wall_1,
+            profile=ifcplus.api.profile.add_parameterized_profile(
+                ifc4_file=ifc4_file,
+                profile_class="IfcRectangleProfileDef",
+                dimensions=[2.0, 1.0],
+                profile_name=None,
+                check_for_duplicate=True,
+                calculate_mechanical_properties=False,
+            ),
+            depth=opening_depth,
+            origin_relative_to_voided_element=(2.0, -opening_depth / 2.0, 1.5),
+            z_axis_relative_to_voided_element=(0.0, 1.0, 0.0),
+            x_axis_relative_to_voided_element=(-1.0, 0.0, 0.0),
+        )
+
+        ifcplus.api.built_element.create_opening_element(
+            voided_element=wall_1,
+            profile=ifcplus.api.profile.add_parameterized_profile(
+                ifc4_file=ifc4_file,
+                profile_class="IfcCircleProfileDef",
+                dimensions=[0.5],
+                profile_name=None,
+                check_for_duplicate=True,
+                calculate_mechanical_properties=False,
+            ),
+            depth=opening_depth,
+            origin_relative_to_voided_element=(4.5, -opening_depth / 2.0, 2.0),
+            z_axis_relative_to_voided_element=(0.0, 1.0, 0.0),
+            x_axis_relative_to_voided_element=(-1.0, 0.0, 0.0),
+        )
+
+        wall_2 = ifcplus.api.built_element.create_2pt_wall(
+            start_point_2d=(1.0 + 8.0, 1.0),
+            end_point_2d=(7.0 + 8.0, 1.0 + 2.0),
+            elevation=1.0,
+            height=3.0,
+            materials=[
+                cast(ifcopenshell.entity_instance, concrete_material),
+                cast(ifcopenshell.entity_instance, steel_material),
+                cast(ifcopenshell.entity_instance, concrete_material),
+            ],
+            thicknesses=[0.10, 0.10, 0.20],
+            name="Wall-01",
+            parent=site,
+            place_object_relative_to_parent=True,
+        )
+
+        ifcplus.api.built_element.create_opening_element(
+            voided_element=wall_2,
+            profile=ifcplus.api.profile.add_parameterized_profile(
+                ifc4_file=ifc4_file,
+                profile_class="IfcRectangleProfileDef",
+                dimensions=[2.0, 1.0],
+                profile_name=None,
+                check_for_duplicate=True,
+                calculate_mechanical_properties=False,
+            ),
+            depth=opening_depth,
+            origin_relative_to_voided_element=(2.0, -opening_depth / 2.0, 1.5),
+            z_axis_relative_to_voided_element=(0.0, 1.0, 0.0),
+            x_axis_relative_to_voided_element=(-1.0, 0.0, 0.0),
+        )
+
+        output_path = str(
+            OUTPUT_DIR_FOR_BUILT_ELEMENT / "straight_walls_with_openings.ifc"
+        )
+        ifcplus.api.project.write_to_ifc_spf(
+            ifc4_file=ifc4_file,
+            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