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

Diffs are now supported in non-legacy importer

Browse Source
This commit is contained in:
Dion Moult
2020-04-07 15:44:54 +10:00
parent 3049d24f6f
commit e86839d2db
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcblenderexport/blenderbim/scripts/addons/bim/import_ifc.py
+15 -1
View File
@@ -207,11 +207,12 @@ class IfcImporter():
if self.ifc_import_settings.should_import_opening_elements: if self.ifc_import_settings.should_import_opening_elements:
self.create_openings_collection() self.create_openings_collection()
self.purge_diff() self.purge_diff()
self.filter_ifc()
self.patch_ifc() self.patch_ifc()
self.create_type_products() self.create_type_products()
self.create_grids() self.create_grids()
# TODO: Deprecate after bug #682 is fixed and the new importer is stable # TODO: Deprecate after bug #682 is fixed and the new importer is stable
if self.ifc_import_settings.should_use_legacy or self.diff: if self.ifc_import_settings.should_use_legacy:
self.create_products_legacy() self.create_products_legacy()
else: else:
self.create_products() self.create_products()
@@ -254,6 +255,13 @@ class IfcImporter():
or abs(point.Coordinates[1]) > 1000000 \ or abs(point.Coordinates[1]) > 1000000 \
or abs(point.Coordinates[2]) > 1000000 or abs(point.Coordinates[2]) > 1000000
def filter_ifc(self):
for element in self.file.by_type('IfcElement'):
if self.diff \
and element.GlobalId not in self.diff['added'] \
and element.GlobalId not in self.diff['changed'].keys():
self.file.remove(element)
def patch_ifc(self): def patch_ifc(self):
project = self.file.by_type('IfcProject')[0] project = self.file.by_type('IfcProject')[0]
if self.ifc_import_settings.should_ignore_site_coordinates: if self.ifc_import_settings.should_ignore_site_coordinates:
@@ -424,8 +432,11 @@ class IfcImporter():
bpy.ops.object.join(context_override) bpy.ops.object.join(context_override)
def clean_mesh(self): def clean_mesh(self):
obj = None
for obj in self.added_data.values(): for obj in self.added_data.values():
obj.select_set(True) obj.select_set(True)
if not obj:
return
bpy.context.view_layer.objects.active = obj bpy.context.view_layer.objects.active = obj
context_override = {} context_override = {}
bpy.ops.object.editmode_toggle(context_override) bpy.ops.object.editmode_toggle(context_override)
@@ -658,6 +669,9 @@ class IfcImporter():
obj.matrix_world = self.get_element_matrix(element, mesh_name) obj.matrix_world = self.get_element_matrix(element, mesh_name)
self.add_element_attributes(element, obj) self.add_element_attributes(element, obj)
self.add_element_document_relations(element, obj) self.add_element_document_relations(element, obj)
self.add_defines_by_type_relation(element, obj)
self.add_product_definitions(element, obj)
self.added_data[element.GlobalId] = obj
def add_element_document_relations(self, element, obj): def add_element_document_relations(self, element, obj):
for association in element.HasAssociations: for association in element.HasAssociations: