Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 15:08:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

IFC Clash now uses iterator filters for faster clashing when using filters

Browse Source
This commit is contained in:
Dion Moult
2020-10-22 13:01:04 +11:00
parent 1a09658ec9
commit 4013a7e8b7
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcclash/ifcclash.py
+10 -21
View File
@@ -37,8 +37,6 @@ class IfcClasher:
for data in clash_set[ab]: for data in clash_set[ab]:
data['ifc'] = ifcopenshell.open(data['file']) data['ifc'] = ifcopenshell.open(data['file'])
self.patch_ifc(data['ifc']) self.patch_ifc(data['ifc'])
self.settings.logger.info(f'Purging unnecessary elements {ab} ...')
self.purge_elements(data)
self.settings.logger.info(f'Creating collision data for {ab} ...') self.settings.logger.info(f'Creating collision data for {ab} ...')
if len(data['ifc'].by_type('IfcElement')) > 0: if len(data['ifc'].by_type('IfcElement')) > 0:
self.add_collision_objects(data, clash_set[f'{ab}_cm']) self.add_collision_objects(data, clash_set[f'{ab}_cm'])
@@ -170,27 +168,18 @@ class IfcClasher:
except: except:
pass pass
def purge_elements(self, data):
if 'selector' not in data:
for element in data['ifc'].by_type('IfcSpace'):
data['ifc'].remove(element)
return
selector = ifcopenshell.util.selector.Selector()
elements = selector.parse(data['ifc'], data['selector'])
if data['mode'] == 'e':
for element in data['ifc'].by_type('IfcElement') + data['ifc'].by_type('IfcSpatialStructureElement'):
if element in elements:
data['ifc'].remove(element)
elif data['mode'] == 'i':
for element in data['ifc'].by_type('IfcElement') + data['ifc'].by_type('IfcSpatialStructureElement'):
if element not in elements:
data['ifc'].remove(element)
def add_collision_objects(self, data, cm): def add_collision_objects(self, data, cm):
self.clash_data['meshes'] = {} self.clash_data['meshes'] = {}
iterator = ifcopenshell.geom.iterator(self.geom_settings, data['ifc'], multiprocessing.cpu_count()) selector = ifcopenshell.util.selector.Selector()
if 'selector' not in data:
iterator = ifcopenshell.geom.iterator(self.geom_settings, data['ifc'], multiprocessing.cpu_count(),
exclude=(data['ifc'].by_type('IfcSpatialStructureElement')))
elif data['mode'] == 'e':
iterator = ifcopenshell.geom.iterator(self.geom_settings, data['ifc'], multiprocessing.cpu_count(),
exclude=selector.parse(data['ifc'], data['selector']))
elif data['mode'] == 'i':
iterator = ifcopenshell.geom.iterator(self.geom_settings, data['ifc'], multiprocessing.cpu_count(),
include=selector.parse(data['ifc'], data['selector']))
valid_file = iterator.initialize() valid_file = iterator.initialize()
if not valid_file: if not valid_file:
return False return False