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

Merge pull request #830 from s-leger/patch-3

Browse Source 
Remove hardcoded selection
This commit is contained in:
Dion Moult
2020-04-09 10:51:57 +10:00
committed by GitHub
parent dd1b0a1056 f59f017bde
commit 2db3cf0aa0
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcblenderexport/blenderbim/scripts/addons/bim/export_ifc.py
+10 -12
View File
@@ -126,13 +126,13 @@ class IfcParser():
self.libraries = [] self.libraries = []
self.products = [] self.products = []
def parse(self): def parse(self, selected_objects):
self.units = self.get_units() self.units = self.get_units()
self.unit_scale = self.get_unit_scale() self.unit_scale = self.get_unit_scale()
self.people = self.get_people() self.people = self.get_people()
self.organisations = self.get_organisations() self.organisations = self.get_organisations()
selected_objects = self.add_spatial_elements_if_unselected(bpy.context.selected_objects) unique_objects = self.add_spatial_elements_if_unselected(selected_objects)
self.categorise_selected_objects(selected_objects) self.categorise_selected_objects(unique_objects)
self.psets = self.get_psets() self.psets = self.get_psets()
self.material_psets = self.get_material_psets() self.material_psets = self.get_material_psets()
self.documents = self.get_documents() self.documents = self.get_documents()
@@ -535,14 +535,12 @@ class IfcParser():
return parent_collection return parent_collection
def add_spatial_elements_if_unselected(self, selected_objects): def add_spatial_elements_if_unselected(self, selected_objects):
results = [] results = set(selected_objects)
base_collections = [] base_collections = set()
added_objs = [] added_objs = []
for obj in selected_objects: for obj in selected_objects:
results.append(obj)
for collection in obj.users_collection: for collection in obj.users_collection:
base_collections.append(collection) base_collections.add(collection)
base_collections = list(set(base_collections))
for collection in base_collections: for collection in base_collections:
spatial_obj = bpy.data.objects.get(collection.name) spatial_obj = bpy.data.objects.get(collection.name)
if not spatial_obj or spatial_obj in added_objs: if not spatial_obj or spatial_obj in added_objs:
@@ -555,8 +553,8 @@ class IfcParser():
continue continue
added_objs.append(spatial_obj) added_objs.append(spatial_obj)
parent_collection = self.get_parent_collection(parent_collection) parent_collection = self.get_parent_collection(parent_collection)
results.extend(added_objs) results.update(added_objs)
return set(results) return results
def categorise_selected_objects(self, objects_to_sort, metadata=None): def categorise_selected_objects(self, objects_to_sort, metadata=None):
if not metadata: if not metadata:
@@ -1097,9 +1095,9 @@ class IfcExporter():
self.ifc_parser = ifc_parser self.ifc_parser = ifc_parser
self.qto_calculator = qto_calculator self.qto_calculator = qto_calculator
def export(self): def export(self, selected_objects):
self.file = ifcopenshell.open(self.template_file) self.file = ifcopenshell.open(self.template_file)
self.ifc_parser.parse() self.ifc_parser.parse(selected_objects)
self.create_units() self.create_units()
self.create_people() self.create_people()
self.create_organisations() self.create_organisations()
src/ifcblenderexport/blenderbim/scripts/addons/bim/operator.py
+1 -1
View File
@@ -57,7 +57,7 @@ class ExportIFC(bpy.types.Operator):
qto_calculator = export_ifc.QtoCalculator() qto_calculator = export_ifc.QtoCalculator()
ifc_exporter = export_ifc.IfcExporter(ifc_export_settings, ifc_parser, qto_calculator) ifc_exporter = export_ifc.IfcExporter(ifc_export_settings, ifc_parser, qto_calculator)
ifc_export_settings.logger.info('Starting export') ifc_export_settings.logger.info('Starting export')
ifc_exporter.export() ifc_exporter.export(context.selected_objects)
ifc_export_settings.logger.info('Export finished in {:.2f} seconds'.format(time.time() - start)) ifc_export_settings.logger.info('Export finished in {:.2f} seconds'.format(time.time() - start))
return {'FINISHED'} return {'FINISHED'}