Skip to content

Commit 76fa24b

Browse files
committed
move ifcplus to src
1 parent 95bed87 commit 76fa24b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+346
-496
lines changed
File renamed without changes.
File renamed without changes.

src/bim2fem/ifcplus/api/building_element.py renamed to src/ifcplus/api/building_element.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import ifcopenshell.api.project
1111
import ifcopenshell
1212
import ifcopenshell.api.geometry
13-
import ifcplus.inlbim.api.placement
13+
import ifcplus.api.placement
1414
import ifcopenshell.api.root
1515
import ifcopenshell.api.spatial
16-
import inlbim.inlbim.api.geometry
16+
import ifcplus.api.geometry
1717
import ifcplus.api.profile
1818

1919
BUILT_ELEMENT_FRAME_MEMBER = Literal["IfcBeam", "IfcColumn", "IfcMember"]
@@ -79,12 +79,12 @@ def create_3pt_beam_or_column_or_member(
7979
length = float(np.linalg.norm(z_axis))
8080

8181
# Add and assign representation
82-
representation_item = ifcplus.api.representation.add_extruded_area_solid(
82+
representation_item = ifcplus.api.geometry.add_extruded_area_solid(
8383
ifc4_file=ifc4_file,
8484
profile=profile_def,
8585
extrusion_depth=length,
8686
)
87-
shape_model = ifcplus.api.representation.add_shape_model(
87+
shape_model = ifcplus.api.geometry.add_shape_model(
8888
ifc4_file=ifc4_file,
8989
shape_model_class="IfcShapeRepresentation",
9090
representation_identifier="Body",
@@ -103,8 +103,8 @@ def create_3pt_beam_or_column_or_member(
103103
ifcplus.api.placement.edit_object_placement(
104104
product=beam_or_column_or_member,
105105
repositioned_origin=p1,
106-
repositioned_z_axis=z_axis,
107-
repositioned_x_axis=x_axis,
106+
repositioned_z_axis=tuple(z_axis.tolist()),
107+
repositioned_x_axis=tuple(x_axis.tolist()),
108108
place_object_relative_to_parent=should_transform_relative_to_parent,
109109
)
110110

@@ -179,15 +179,15 @@ def create_opening_element(
179179
)
180180

181181
# Add and Assign Representation
182-
representation_item = ifcplus.api.representation.add_extruded_area_solid(
182+
representation_item = ifcplus.api.geometry.add_extruded_area_solid(
183183
ifc4_file=ifc4_file,
184184
profile=profile,
185185
extrusion_depth=depth,
186186
repositioned_origin=origin_relative_to_voided_element,
187187
repositioned_x_axis=x_axis_relative_to_voided_element,
188188
repositioned_z_axis=z_axis_relative_to_voided_element,
189189
)
190-
shape_model = ifcplus.api.representation.add_shape_model(
190+
shape_model = ifcplus.api.geometry.add_shape_model(
191191
ifc4_file=ifc4_file,
192192
shape_model_class="IfcShapeRepresentation",
193193
representation_identifier="Body",
@@ -263,7 +263,7 @@ def create_2pt_wall(
263263
length = float(np.linalg.norm(x_axis))
264264

265265
# Add and assign representation
266-
representation_item = ifcplus.api.representation.add_extruded_area_solid(
266+
representation_item = ifcplus.api.geometry.add_extruded_area_solid(
267267
ifc4_file=ifc4_file,
268268
profile=ifcplus.api.profile.add_arbitrary_profile_with_or_without_voids(
269269
file=ifc4_file,
@@ -279,7 +279,7 @@ def create_2pt_wall(
279279
),
280280
extrusion_depth=height,
281281
)
282-
shape_model = ifcplus.api.representation.add_shape_model(
282+
shape_model = ifcplus.api.geometry.add_shape_model(
283283
ifc4_file=ifc4_file,
284284
shape_model_class="IfcShapeRepresentation",
285285
representation_identifier="Body",
@@ -298,7 +298,7 @@ def create_2pt_wall(
298298
ifcplus.api.placement.edit_object_placement(
299299
product=wall,
300300
repositioned_origin=(p1[0], p1[1], elevation),
301-
repositioned_z_axis=z_axis,
301+
repositioned_z_axis=tuple(z_axis.tolist()),
302302
repositioned_x_axis=x_axis,
303303
place_object_relative_to_parent=should_transform_relative_to_parent,
304304
)
@@ -394,7 +394,7 @@ def create_npt_slab(
394394
thickness = sum(thicknesses)
395395

396396
# Add and assign representation
397-
representation_item = ifcplus.api.representation.add_extruded_area_solid(
397+
representation_item = ifcplus.api.geometry.add_extruded_area_solid(
398398
ifc4_file=ifc4_file,
399399
profile=ifcplus.api.profile.add_arbitrary_profile_with_or_without_voids(
400400
file=ifc4_file,
@@ -405,7 +405,7 @@ def create_npt_slab(
405405
repositioned_origin=(0.0, 0.0, -thickness / 2),
406406
extrusion_depth=thickness,
407407
)
408-
shape_model = ifcplus.api.representation.add_shape_model(
408+
shape_model = ifcplus.api.geometry.add_shape_model(
409409
ifc4_file=ifc4_file,
410410
shape_model_class="IfcShapeRepresentation",
411411
representation_identifier="Body",

0 commit comments

Comments
 (0)