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

Fix classification round-trip bug

Browse Source
This commit is contained in:
Dion Moult
2020-05-04 18:46:19 +10:00
parent 11362becc8
commit 3fedbad7bb
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcblenderexport/blenderbim/bim/import_ifc.py
+16 -10
View File
@@ -199,6 +199,7 @@ class IfcImporter():
self.settings_2d = ifcopenshell.geom.settings() self.settings_2d = ifcopenshell.geom.settings()
self.settings_2d.set(self.settings_2d.INCLUDE_CURVES, True) self.settings_2d.set(self.settings_2d.INCLUDE_CURVES, True)
self.project = None self.project = None
self.classifications = {}
self.spatial_structure_elements = {} self.spatial_structure_elements = {}
self.elements = {} self.elements = {}
self.type_products = {} self.type_products = {}
@@ -740,8 +741,8 @@ class IfcImporter():
del self.added_data[self.project['ifc'].GlobalId] del self.added_data[self.project['ifc'].GlobalId]
def create_classifications(self): def create_classifications(self):
for classification in self.file.by_type('IfcClassification'): for element in self.file.by_type('IfcClassification'):
data = bpy.context.scene.BIMProperties.classifications.add() classification = bpy.context.scene.BIMProperties.classifications.add()
data_map = { data_map = {
'name': 'Name', 'source': 'Source', 'name': 'Name', 'source': 'Source',
'edition': 'Edition', 'edition_date': 'EditionDate', 'edition': 'Edition', 'edition_date': 'EditionDate',
@@ -749,21 +750,23 @@ class IfcImporter():
'reference_tokens': 'ReferenceTokens' 'reference_tokens': 'ReferenceTokens'
} }
for key, value in data_map.items(): for key, value in data_map.items():
if hasattr(classification, value) and getattr(classification, value): if hasattr(element, value) and getattr(element, value):
setattr(data, key, str(getattr(classification, value))) setattr(classification, key, str(getattr(element, value)))
classification_file = ifcopenshell.file(schema=self.file.wrapped_data.schema) classification_file = ifcopenshell.file(schema=self.file.wrapped_data.schema)
references = [classification] references = [element]
while references: while references:
entities_to_add = references entities_to_add = references
references = self.get_classification_references(references) references = self.get_classification_references(references)
classification_file.add(classification) classification_file.add(element)
for entity in entities_to_add: for entity in entities_to_add:
classification_file.add(entity) classification_file.add(entity)
classification_filename = '{}-{}.ifc'.format( classification_filename = '{}-{}'.format(
Path(os.path.basename(self.ifc_import_settings.input_file)).stem, classification.Name) Path(os.path.basename(self.ifc_import_settings.input_file)).stem, element.Name)
classification_file.write(os.path.join( classification_file.write(os.path.join(
bpy.context.scene.BIMProperties.schema_dir, 'classifications', classification_filename)) bpy.context.scene.BIMProperties.schema_dir, 'classifications',
data.filename = classification_filename '{}.ifc'.format(classification_filename)))
classification.filename = classification_filename
self.classifications[classification.filename] = classification
def get_classification_references(self, references): def get_classification_references(self, references):
results = [] results = []
@@ -996,6 +999,9 @@ class IfcImporter():
def get_referenced_source_name(self, element): def get_referenced_source_name(self, element):
if not hasattr(element, 'ReferencedSource') or not element.ReferencedSource: if not hasattr(element, 'ReferencedSource') or not element.ReferencedSource:
if element.is_a('IfcClassification'): if element.is_a('IfcClassification'):
for filename, classification in self.classifications.items():
if classification.name == element.Name:
return filename
return element.Name return element.Name
else: else:
return element.Identification return element.Identification