Skip to content

Commit

Permalink
Merge pull request #4440 from brunoperdigao/fix-normal-duplication-of…
Browse files Browse the repository at this point in the history 
…-linked-aggregate

Fix normal duplication of linked aggregate
  • Loading branch information
@brunoperdigao
brunoperdigao committed Apr 30, 2024
2 parents 8dde98f + 01361cc commit 97e0c43
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 54 deletions.
11 changes: 6 additions & 5 deletions src/blenderbim/blenderbim/bim/module/aggregate/operator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,13 @@ def _execute(self, context):
)

# Removes Pset related to Linked Aggregates
pset = ifcopenshell.util.element.get_pset(element, "BBIM_Linked_Aggregate")
if pset:
pset = tool.Ifc.get().by_id(pset["id"])
ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)

if not element.is_a('IfcElementAssembly'):
pset = ifcopenshell.util.element.get_pset(element, 'BBIM_Linked_Aggregate')
if pset:
pset = tool.Ifc.get().by_id(pset["id"])
ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)


class BIM_OT_enable_editing_aggregate(bpy.types.Operator, Operator):
"""Enable editing aggregation relationship"""

Expand Down
127 changes: 78 additions & 49 deletions src/blenderbim/blenderbim/bim/module/geometry/operator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ def execute_ifc_duplicate_operator(self, context, linked=False):

# Recreate decompositions
tool.Root.recreate_decompositions(decomposition_relationships, old_to_new)
OverrideDuplicateMove.handle_linked_aggregates(old_to_new)
OverrideDuplicateMove.remove_linked_aggregate_data(old_to_new)
blenderbim.bim.handler.refresh_ui_data()
return old_to_new

Expand Down Expand Up @@ -896,25 +896,21 @@ def remove_old_connections(old_to_new):
if entity in old_to_new.keys():
core.remove_connection(tool.Geometry, connection=connection)

@staticmethod
def handle_linked_aggregates(old_to_new):
def remove_linked_aggregate_data(old_to_new):
for old, new in old_to_new.items():
pset = ifcopenshell.util.element.get_pset(new[0], "BBIM_Linked_Aggregate")
if pset:
old_aggregate = ifcopenshell.util.element.get_aggregate(old)
new_aggregate = ifcopenshell.util.element.get_aggregate(new[0])
if old_aggregate == new_aggregate:
parts = ifcopenshell.util.element.get_parts(new_aggregate)
if parts:
index = DuplicateMoveLinkedAggregate.get_max_index(parts)
index += 1
pset = tool.Ifc.get().by_id(pset["id"])
ifcopenshell.api.run(
"pset.edit_pset",
tool.Ifc.get(),
pset=pset,
properties={"Index": index},
)
pset = tool.Ifc.get().by_id(pset["id"])
ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)

if new[0].is_a("IfcElementAssembly"):
linked_aggregate_group = [
r.RelatingGroup
for r in getattr(new[0], "HasAssignments", []) or []
if r.is_a("IfcRelAssignsToGroup")
if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
]
tool.Ifc.run("group.unassign_group", group=linked_aggregate_group[0], product=new[0])


class OverrideDuplicateMoveLinkedMacro(bpy.types.Macro):
Expand Down Expand Up @@ -975,16 +971,16 @@ def select_objects_and_add_data(element):
obj.select_set(True)
parts = ifcopenshell.util.element.get_parts(element)
if parts:
index = DuplicateMoveLinkedAggregate.get_max_index(parts)
index = get_max_index(parts)
add_linked_aggregate_pset(element, index)
index += 1
for part in parts:
if part.is_a("IfcElementAssembly"):
select_objects_and_add_data(part)
else:
add_linked_aggregate_pset(part, index)
index += 1

index = add_linked_aggregate_pset(part, index)
# index += 1
obj = tool.Ifc.get_object(part)
obj.select_set(True)

Expand All @@ -1000,6 +996,8 @@ def add_linked_aggregate_pset(part, index):
pset=pset,
properties={"Index": index},
)

index += 1
else:
pass

Expand Down Expand Up @@ -1042,6 +1040,40 @@ def custom_incremental_naming_for_element_assembly(old_to_new):
if re.findall(pattern2, new_obj.name):
split_name = new_obj.name.split(".")
new_obj.name = split_name[0] + "_" + number

def get_max_index(parts):
psets = [ifcopenshell.util.element.get_pset(p, "BBIM_Linked_Aggregate") for p in parts]
index = [i['Index'] for i in psets if i]
if len(index) > 0:
index = max(index)
return index
else:
return 0

def copy_linked_aggregate_data(old_to_new):
for old, new in old_to_new.items():
pset = ifcopenshell.util.element.get_pset(old, "BBIM_Linked_Aggregate")
if pset:
new_pset = ifcopenshell.api.run(
"pset.add_pset", tool.Ifc.get(), product=new[0], name=self.pset_name
)

ifcopenshell.api.run(
"pset.edit_pset",
tool.Ifc.get(),
pset=new_pset,
properties={"Index": pset["Index"]},
)

if new[0].is_a("IfcElementAssembly"):
linked_aggregate_group = [
r.RelatingGroup
for r in getattr(old, "HasAssignments", []) or []
if r.is_a("IfcRelAssignsToGroup")
if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
]
tool.Ifc.run("group.assign_group", group=linked_aggregate_group[0], products=new)


if len(context.selected_objects) != 1:
return {"FINISHED"}
Expand All @@ -1062,28 +1094,17 @@ def custom_incremental_naming_for_element_assembly(old_to_new):
select_objects_and_add_data(selected_element)

old_to_new = OverrideDuplicateMove.execute_ifc_duplicate_operator(self, context, linked=True)

tool.Root.recreate_aggregate(old_to_new)

custom_incremental_naming_for_element_assembly(old_to_new)
copy_linked_aggregate_data(old_to_new)

# Recreate aggregate relationship
for old in old_to_new.keys():
if old.is_a("IfcElementAssembly"):
tool.Root.recreate_aggregate(old_to_new)
custom_incremental_naming_for_element_assembly(old_to_new)

blenderbim.bim.handler.refresh_ui_data()

return old_to_new

@staticmethod
def get_max_index(parts):
psets = [ifcopenshell.util.element.get_pset(p, "BBIM_Linked_Aggregate") for p in parts]
index = [i["Index"] for i in psets if i]
if len(index) > 0:
index = max(index)
return index
else:
return 0


class RefreshLinkedAggregate(bpy.types.Operator):
bl_idname = "bim.refresh_linked_aggregate"
Expand Down Expand Up @@ -1217,6 +1238,23 @@ def handle_selection(selected_objs):

return list(set(linked_aggregate_groups)), selected_parents

def get_original_matrix(element, base_instance):
selected_obj = tool.Ifc.get_object(base_instance)
selected_matrix = selected_obj.matrix_world
object_duplicate = tool.Ifc.get_object(element)
duplicate_matrix = object_duplicate.matrix_world.decompose()

return selected_matrix, duplicate_matrix

def set_new_matrix(selected_matrix, duplicate_matrix, old_to_new):
for old, new in old_to_new.items():
new_obj = tool.Ifc.get_object(new[0])
new_base_matrix = Matrix.LocRotScale(*duplicate_matrix)
matrix_diff = Matrix.inverted(selected_matrix) @ new_obj.matrix_world
new_obj_matrix = new_base_matrix @ matrix_diff
new_obj.matrix_world = new_obj_matrix


active_element = tool.Ifc.get_entity(context.active_object)
if not active_element:
self.report({"INFO"}, "Object has no Ifc metadata.")
Expand Down Expand Up @@ -1256,10 +1294,7 @@ def handle_selection(selected_objs):

element_aggregate = ifcopenshell.util.element.get_aggregate(element)

selected_obj = tool.Ifc.get_object(base_instance)
selected_matrix = selected_obj.matrix_world
object_duplicate = tool.Ifc.get_object(element)
duplicate_matrix = object_duplicate.matrix_world.decompose()
selected_matrix, duplicate_matrix = get_original_matrix(element, base_instance)

original_names = get_original_names(element)

Expand All @@ -1270,15 +1305,9 @@ def handle_selection(selected_objs):

tool.Ifc.get_object(base_instance).select_set(True)

old_to_new = DuplicateMoveLinkedAggregate.execute_ifc_duplicate_linked_aggregate_operator(
self, context
)
for old, new in old_to_new.items():
new_obj = tool.Ifc.get_object(new[0])
new_base_matrix = Matrix.LocRotScale(*duplicate_matrix)
matrix_diff = Matrix.inverted(selected_matrix) @ new_obj.matrix_world
new_obj_matrix = new_base_matrix @ matrix_diff
new_obj.matrix_world = new_obj_matrix
old_to_new = DuplicateMoveLinkedAggregate.execute_ifc_duplicate_linked_aggregate_operator(self, context)

set_new_matrix(selected_matrix, duplicate_matrix, old_to_new)

for old, new in old_to_new.items():
if element_aggregate and new[0].is_a("IfcElementAssembly"):
Expand Down

0 comments on commit 97e0c43

Please sign in to comment.