Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 01:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

util.element - check schema version explicitly

Browse Source
This commit is contained in:
Andrej730
2024-11-08 11:53:03 +05:00
parent 1b2508f8de
commit 5597095198
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/util/element.py
+15 -9
View File
@@ -525,10 +525,12 @@ def get_types(type: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_in
element_type = ifcopenshell.by_type("IfcWallType")[0] element_type = ifcopenshell.by_type("IfcWallType")[0]
walls = ifcopenshell.util.element.get_types(element_type) walls = ifcopenshell.util.element.get_types(element_type)
""" """
for rel in getattr(type, "Types", []): if type.file.schema == "IFC2X3":
return rel.RelatedObjects if object_type_of := getattr(type, "ObjectTypeOf", ()):
for rel in getattr(type, "ObjectTypeOf", []): return object_type_of[0].RelatedObjects
return rel.RelatedObjects else:
if types := getattr(type, "Types", ()):
return types[0].RelatedObjects
return [] return []
@@ -1125,8 +1127,9 @@ def get_aggregate(element: ifcopenshell.entity_instance) -> Union[ifcopenshell.e
element = file.by_type("IfcBeam")[0] element = file.by_type("IfcBeam")[0]
aggregate = ifcopenshell.util.element.get_aggregate(element) aggregate = ifcopenshell.util.element.get_aggregate(element)
""" """
is_not_ifc2x3 = element.file.schema != "IFC2X3"
if decomposes := getattr(element, "Decomposes", None): if decomposes := getattr(element, "Decomposes", None):
if decomposes[0].is_a("IfcRelAggregates"): # IFC2X3 if is_not_ifc2x3 or decomposes[0].is_a("IfcRelAggregates"):
return decomposes[0].RelatingObject return decomposes[0].RelatingObject
@@ -1144,12 +1147,15 @@ def get_nest(element: ifcopenshell.entity_instance) -> Union[ifcopenshell.entity
element = file.by_type("IfcBeam")[0] element = file.by_type("IfcBeam")[0]
aggregate = ifcopenshell.util.element.get_nest(element) aggregate = ifcopenshell.util.element.get_nest(element)
""" """
if (nests := getattr(element, "Nests", None)) is not None: is_ifc2x3 = element.file.schema == "IFC2X3"
if nests: if is_ifc2x3:
return nests[0].RelatingObject if not (decomposes := getattr(element, "Decomposes", None)):
elif (decomposes := getattr(element, "Decomposes", None)) is not None and decomposes: # IFC2X3 return
if decomposes[0].is_a("IfcRelNests"): if decomposes[0].is_a("IfcRelNests"):
return decomposes[0].RelatingObject return decomposes[0].RelatingObject
else:
if nests := getattr(element, "Nests", None):
return nests[0].RelatingObject
def get_parts(element: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_instance]: def get_parts(element: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_instance]: