Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 06:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

See #5839. More accurately consider the relating product definition when checking for shape aspects.

Browse Source
This commit is contained in:
Dion Moult
2025-02-16 17:08:55 +11:00
parent 42e184c936
commit 8f261be338
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/geometry/operator.py
+26 -8
View File
@@ -2370,11 +2370,30 @@ class EnableEditingRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
if obj.data and hasattr(obj.data, "BIMMeshProperties"): if obj.data and hasattr(obj.data, "BIMMeshProperties"):
active_representation_id = obj.data.BIMMeshProperties.ifc_definition_id active_representation_id = obj.data.BIMMeshProperties.ifc_definition_id
element = tool.Ifc.get().by_id(active_representation_id) representation = tool.Ifc.get().by_id(active_representation_id)
# Shape aspects must be considered from the PartOfProductDefinitionShape level
element = tool.Ifc.get_entity(obj)
product_reps = []
if element.is_a("IfcProduct"):
product_reps = [element.Representation]
if element_type := ifcopenshell.util.element.get_type(element):
product_reps.extend(element_type.RepresentationMaps or [])
elif element.is_a("IfcTypeProduct"):
product_reps = element.RepresentationMaps
item_aspect = {}
for product_rep in product_reps:
for aspect in product_rep.HasShapeAspects:
for aspect_rep in aspect.ShapeRepresentations:
if aspect_rep.ContextOfItems != representation.ContextOfItems:
continue
for item in aspect_rep.Items:
item_aspect[item] = aspect
# IfcShapeRepresentation or IfcTopologyRepresentation. # IfcShapeRepresentation or IfcTopologyRepresentation.
if not element.is_a("IfcShapeModel"): if not representation.is_a("IfcShapeModel"):
return return
queue = list(element.Items) queue = list(representation.Items)
while queue: while queue:
item = queue.pop() item = queue.pop()
if item.is_a("IfcMappedItem"): if item.is_a("IfcMappedItem"):
@@ -2397,16 +2416,15 @@ class EnableEditingRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
elif inverse.is_a("IfcPresentationLayerAssignment"): elif inverse.is_a("IfcPresentationLayerAssignment"):
new.layer = inverse.Name or "Unnamed" new.layer = inverse.Name or "Unnamed"
new.layer_id = inverse.id() new.layer_id = inverse.id()
elif inverse.is_a("IfcShapeRepresentation"):
if inverse.OfShapeAspect:
shape_aspect = inverse.OfShapeAspect[0]
new.shape_aspect = shape_aspect.Name
new.shape_aspect_id = shape_aspect.id()
elif inverse.is_a("IfcIndexedTextureMap"): elif inverse.is_a("IfcIndexedTextureMap"):
add_tag(new, "UV") add_tag(new, "UV")
elif inverse.is_a("IfcIndexedColourMap"): elif inverse.is_a("IfcIndexedColourMap"):
add_tag(new, "Colour") add_tag(new, "Colour")
if aspect := item_aspect.get(item, None):
new.shape_aspect = aspect.Name
new.shape_aspect_id = aspect.id()
# sort created items # sort created items
sorted_items = sorted(props.items[:], key=lambda i: (not i.shape_aspect, i.shape_aspect)) sorted_items = sorted(props.items[:], key=lambda i: (not i.shape_aspect, i.shape_aspect))
for i, item in enumerate(sorted_items[:-1]): # last item is sorted automatically for i, item in enumerate(sorted_items[:-1]): # last item is sorted automatically