From f8e9f81b9b3def9755842464ee00ca2add266665 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Mon, 26 Jul 2021 21:13:15 +1000 Subject: [PATCH] Parametric profiles now auto sync prior to depth changes. See #1588. --- .../blenderbim/bim/module/drawing/operator.py | 7 +++- .../blenderbim/bim/module/model/handler.py | 5 +++ .../blenderbim/bim/module/model/profile.py | 38 +++++++++++++------ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py index 07f7060477..68152795a3 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py @@ -7,6 +7,7 @@ import bmesh import shutil import subprocess import webbrowser +import multiprocessing import ifcopenshell import ifcopenshell.geom import ifcopenshell.util.selector @@ -236,7 +237,7 @@ class CreateDrawing(bpy.types.Operator): # This is a work in progress. See #1153 and #1564. # Switch from old to new if you are testing v0.7.0 self.generate_linework_old(svg_path) - #self.generate_linework_new(svg_path) + # self.generate_linework_new(svg_path) return svg_path def generate_linework_new(self, svg_path): @@ -257,7 +258,9 @@ class CreateDrawing(bpy.types.Operator): excluded_elements = [] for ifc_class in ["IfcSpace", "IfcOpeningElement", "IfcDoor", "IfcWindow"]: excluded_elements += self.file.by_type(ifc_class) - for element in ifcopenshell.geom.iterate(settings, self.file, exclude=excluded_elements): + for element in ifcopenshell.geom.iterate( + settings, self.file, multiprocessing.cpu_count(), exclude=excluded_elements + ): serialiser.write(element) serialiser.finalize() with open(svg_path, "w") as svg: diff --git a/src/blenderbim/blenderbim/bim/module/model/handler.py b/src/blenderbim/blenderbim/bim/module/model/handler.py index 58bfa687aa..7dc1fd8e43 100644 --- a/src/blenderbim/blenderbim/bim/module/model/handler.py +++ b/src/blenderbim/blenderbim/bim/module/model/handler.py @@ -57,6 +57,11 @@ def load_post(*args): ifcopenshell.api.add_pre_listener( "geometry.add_representation", "BlenderBIM.DumbProfile.EnsureSolid", profile.ensure_solid ) + ifcopenshell.api.add_pre_listener( + "material.edit_profile", + "BlenderBIM.DumbProfile.SyncObjectFromProfile", + profile.DumbProfileRegenerator().sync_object_from_profile, + ) ifcopenshell.api.add_post_listener( "material.edit_profile", "BlenderBIM.DumbProfile.RegenerateFromProfile", diff --git a/src/blenderbim/blenderbim/bim/module/model/profile.py b/src/blenderbim/blenderbim/bim/module/model/profile.py index 27240bf9a1..f98c91b894 100644 --- a/src/blenderbim/blenderbim/bim/module/model/profile.py +++ b/src/blenderbim/blenderbim/bim/module/model/profile.py @@ -20,7 +20,7 @@ def element_listener(element, obj): def mode_callback(obj, data): - for obj in bpy.context.selected_objects + [bpy.context.active_object]: + for obj in set(bpy.context.selected_objects + [bpy.context.active_object]): if ( obj.mode != "EDIT" or not obj.data @@ -147,30 +147,40 @@ class DumbProfileGenerator: class DumbProfileRegenerator: def regenerate_from_profile(self, usecase_path, ifc_file, settings): - self.file = IfcStore.get_file() - self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file) + self.file = ifc_file profile = settings["profile"].Profile if not profile: return + for element in self.get_elements_using_profile(profile): + self.change_profile(element) + + def sync_object_from_profile(self, usecase_path, ifc_file, settings): + self.file = ifc_file + profile = settings["profile"].Profile + if not profile: + return + for element in self.get_elements_using_profile(profile): + self.sync_object(element) + + def get_elements_using_profile(self, profile): + results = [] for profile_set in [ mp.ToMaterialProfileSet[0] for mp in self.file.get_inverse(profile) if mp.is_a("IfcMaterialProfile") ]: - for inverse in ifc_file.get_inverse(profile_set): + for inverse in self.file.get_inverse(profile_set): if not inverse.is_a("IfcMaterialProfileSetUsage"): continue - if ifc_file.schema == "IFC2X3": - for rel in ifc_file.get_inverse(inverse): + if self.file.schema == "IFC2X3": + for rel in self.file.get_inverse(inverse): if not rel.is_a("IfcRelAssociatesMaterial"): continue - for element in rel.RelatedObjects: - self.change_profile(element) + results.extend(rel.RelatedObjects) else: for rel in inverse.AssociatedTo: - for element in rel.RelatedObjects: - self.change_profile(element) + results.extend(rel.RelatedObjects) + return results def regenerate_from_type(self, usecase_path, ifc_file, settings): - self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file) new_material = ifcopenshell.util.element.get_material(settings["relating_type"]) if not new_material or not new_material.is_a("IfcMaterialProfileSet"): return @@ -185,3 +195,9 @@ class DumbProfileRegenerator: bpy.ops.bim.switch_representation( obj=obj.name, ifc_definition_id=representation.id(), should_reload=True, should_switch_all_meshes=True ) + + def sync_object(self, element): + obj = IfcStore.get_element(element.id()) + if not obj or obj not in IfcStore.edited_objs: + return + bpy.ops.bim.update_representation(obj=obj.name)