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

Remove hardcoded input objects

Browse Source 
Small cleanup of add_spatial_elements_if_unselected using sets
IfcExporter.export and IfcParser.parse take selected_objects as argument
This commit is contained in:
s-leger
2020-04-09 02:42:03 +02:00
committed by GitHub
parent dd1b0a1056
commit abbaef459b
1 changed files with 10 additions and 12 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.products = []
def parse(self):
def parse(self, selected_objects):
self.units = self.get_units()
self.unit_scale = self.get_unit_scale()
self.people = self.get_people()
self.organisations = self.get_organisations()
selected_objects = self.add_spatial_elements_if_unselected(bpy.context.selected_objects)
self.categorise_selected_objects(selected_objects)
unique_objects = self.add_spatial_elements_if_unselected(selected_objects)
self.categorise_selected_objects(unique_objects)
self.psets = self.get_psets()
self.material_psets = self.get_material_psets()
self.documents = self.get_documents()
@@ -535,14 +535,12 @@ class IfcParser():
return parent_collection
def add_spatial_elements_if_unselected(self, selected_objects):
results = []
base_collections = []
results = set(selected_objects)
base_collections = set()
added_objs = []
for obj in selected_objects:
results.append(obj)
for collection in obj.users_collection:
base_collections.append(collection)
base_collections = list(set(base_collections))
base_collections.add(collection)
for collection in base_collections:
spatial_obj = bpy.data.objects.get(collection.name)
if not spatial_obj or spatial_obj in added_objs:
@@ -555,8 +553,8 @@ class IfcParser():
continue
added_objs.append(spatial_obj)
parent_collection = self.get_parent_collection(parent_collection)
results.extend(added_objs)
return set(results)
results.update(added_objs)
return results
def categorise_selected_objects(self, objects_to_sort, metadata=None):
if not metadata:
@@ -1097,9 +1095,9 @@ class IfcExporter():
self.ifc_parser = ifc_parser
self.qto_calculator = qto_calculator
def export(self):
def export(self, selected_objects):
self.file = ifcopenshell.open(self.template_file)
self.ifc_parser.parse()
self.ifc_parser.parse(selected_objects)
self.create_units()
self.create_people()
self.create_organisations()