Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-28 03:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where import filters didn't properly exclude types and empty objects

Browse Source
This commit is contained in:
Dion Moult
2021-07-28 17:48:36 +10:00
parent cfa0575263
commit 52f15d27b1
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/import_ifc.py
+18 -4
View File
@@ -154,7 +154,7 @@ class IfcImporter:
self.exclude_elements = set() self.exclude_elements = set()
self.project = None self.project = None
self.spatial_structure_elements = {} self.spatial_structure_elements = {}
self.elements = {} self.elements = []
self.type_collection = None self.type_collection = None
self.type_products = {} self.type_products = {}
self.openings = {} self.openings = {}
@@ -475,7 +475,6 @@ class IfcImporter:
grid_collection.objects.link(obj) grid_collection.objects.link(obj)
def create_type_products(self): def create_type_products(self):
type_products = self.file.by_type("IfcTypeProduct")
for collection in self.project["blender"].children: for collection in self.project["blender"].children:
if collection.name == "Types": if collection.name == "Types":
self.type_collection = collection self.type_collection = collection
@@ -483,7 +482,15 @@ class IfcImporter:
if not self.type_collection: if not self.type_collection:
self.type_collection = bpy.data.collections.new("Types") self.type_collection = bpy.data.collections.new("Types")
self.project["blender"].children.link(self.type_collection) self.project["blender"].children.link(self.type_collection)
if self.filter_mode in ["WHITELIST", "BLACKLIST"]:
type_products = set([ifcopenshell.util.element.get_type(e) for e in self.elements])
else:
type_products = self.file.by_type("IfcTypeProduct")
for type_product in type_products: for type_product in type_products:
if not type_product:
continue
self.create_type_product(type_product) self.create_type_product(type_product)
def create_type_product(self, element): def create_type_product(self, element):
@@ -604,7 +611,15 @@ class IfcImporter:
def create_empty_and_2d_elements(self): def create_empty_and_2d_elements(self):
curve_products = [] curve_products = []
for element in self.file.by_type("IfcElement"):
if self.filter_mode == "WHITELIST":
self.elements = self.include_elements
elif self.filter_mode == "BLACKLIST":
self.elements = [e for e in self.file.by_type("IfcElement") if e not in self.exclude_elements]
else:
self.elements = self.file.by_type("IfcElement")
for element in self.elements:
if element.id() in self.added_data: if element.id() in self.added_data:
continue continue
if element.is_a("IfcPort"): if element.is_a("IfcPort"):
@@ -949,7 +964,6 @@ class IfcImporter:
def set_ifc_file(self): def set_ifc_file(self):
bpy.context.scene.BIMProperties.ifc_file = self.ifc_import_settings.input_file bpy.context.scene.BIMProperties.ifc_file = self.ifc_import_settings.input_file
IfcStore.file = self.file
IfcStore.path = self.ifc_import_settings.input_file IfcStore.path = self.ifc_import_settings.input_file
def calculate_unit_scale(self): def calculate_unit_scale(self):