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

Fix #1707. Fix bug where project library browser could self reference.

Browse Source
This commit is contained in:
Dion Moult
2021-08-31 08:22:12 +10:00
parent 0a2afa4879
commit 0ed38a4128
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/project/operator.py
+16 -11
View File
@@ -1,4 +1,3 @@
# BlenderBIM Add-on - OpenBIM Blender Add-on # BlenderBIM Add-on - OpenBIM Blender Add-on
# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com> # Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
# #
@@ -214,20 +213,16 @@ class ChangeLibraryElement(bpy.types.Operator):
self.props.library_elements.clear() self.props.library_elements.clear()
if len(ifc_classes) == 1 and list(ifc_classes)[0] == self.element_name: if len(ifc_classes) == 1 and list(ifc_classes)[0] == self.element_name:
for name, ifc_definition_id in sorted([(self.get_name(e), e.id()) for e in elements]): for name, ifc_definition_id in sorted([(self.get_name(e), e.id()) for e in elements]):
new = self.props.library_elements.add() self.add_library_asset(name, ifc_definition_id)
new.name = name
new.ifc_definition_id = ifc_definition_id
element = IfcStore.library_file.by_id(ifc_definition_id)
if IfcStore.library_file.schema == "IFC2X3" or not IfcStore.library_file.by_type("IfcProjectLibrary"):
new.is_declared = False
elif getattr(element, "HasContext", None) and element.HasContext[0].RelatingContext.is_a(
"IfcProjectLibrary"
):
new.is_declared = True
else: else:
for ifc_class in sorted(ifc_classes): for ifc_class in sorted(ifc_classes):
if ifc_class == self.element_name:
continue
new = self.props.library_elements.add() new = self.props.library_elements.add()
new.name = ifc_class new.name = ifc_class
for name, ifc_definition_id, ifc_class in sorted([(self.get_name(e), e.id(), e.is_a()) for e in elements]):
if ifc_class == self.element_name:
self.add_library_asset(name, ifc_definition_id)
return {"FINISHED"} return {"FINISHED"}
def get_name(self, element): def get_name(self, element):
@@ -235,6 +230,16 @@ class ChangeLibraryElement(bpy.types.Operator):
return element.ProfileName or "Unnamed" return element.ProfileName or "Unnamed"
return element.Name or "Unnamed" return element.Name or "Unnamed"
def add_library_asset(self, name, ifc_definition_id):
new = self.props.library_elements.add()
new.name = name
new.ifc_definition_id = ifc_definition_id
element = IfcStore.library_file.by_id(ifc_definition_id)
if IfcStore.library_file.schema == "IFC2X3" or not IfcStore.library_file.by_type("IfcProjectLibrary"):
new.is_declared = False
elif getattr(element, "HasContext", None) and element.HasContext[0].RelatingContext.is_a("IfcProjectLibrary"):
new.is_declared = True
class RewindLibrary(bpy.types.Operator): class RewindLibrary(bpy.types.Operator):
bl_idname = "bim.rewind_library" bl_idname = "bim.rewind_library"