Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 21:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors due to accessing empty enum

Browse Source
This commit is contained in:
Gorgious
2021-08-19 22:26:00 +02:00
parent 9b9326721d
commit 0f38cd712e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/root/prop.py
+2 -1
View File
@@ -72,7 +72,8 @@ def refreshPredefinedTypes(self, context):
global types_enum global types_enum
types_enum.clear() types_enum.clear()
enum = getIfcPredefinedTypes(self, context) enum = getIfcPredefinedTypes(self, context)
context.scene.BIMRootProperties.ifc_predefined_type = enum[0][0] if enum:
context.scene.BIMRootProperties.ifc_predefined_type = enum[0][0]
def getIfcProducts(self, context): def getIfcProducts(self, context):
src/blenderbim/blenderbim/bim/module/root/ui.py
+10 -6
View File
@@ -18,6 +18,7 @@
# along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>. # along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>.
import bpy import bpy
import blenderbim.bim.module.root.prop as root_prop
from bpy.types import Panel from bpy.types import Panel
from ifcopenshell.api.root.data import Data from ifcopenshell.api.root.data import Data
from blenderbim.bim.ifc import IfcStore from blenderbim.bim.ifc import IfcStore
@@ -49,7 +50,9 @@ class BIM_PT_class(Panel):
row = self.layout.row(align=True) row = self.layout.row(align=True)
row.operator("bim.reassign_class", icon="CHECKMARK") row.operator("bim.reassign_class", icon="CHECKMARK")
row.operator("bim.disable_reassign_class", icon="CANCEL", text="") row.operator("bim.disable_reassign_class", icon="CANCEL", text="")
self.draw_class_dropdowns(context) self.draw_class_dropdowns(
context,
root_prop.getIfcPredefinedTypes(context.scene.BIMRootProperties, context))
else: else:
data = Data.products[props.ifc_definition_id] data = Data.products[props.ifc_definition_id]
name = data["type"] name = data["type"]
@@ -72,23 +75,24 @@ class BIM_PT_class(Panel):
else: else:
row.operator("bim.unassign_class", icon="X", text="").obj = context.active_object.name row.operator("bim.unassign_class", icon="X", text="").obj = context.active_object.name
else: else:
self.draw_class_dropdowns(context) ifc_predefined_types = root_prop.getIfcPredefinedTypes(context.scene.BIMRootProperties, context)
self.draw_class_dropdowns(context, ifc_predefined_types)
row = self.layout.row(align=True) row = self.layout.row(align=True)
op = row.operator("bim.assign_class") op = row.operator("bim.assign_class")
op.ifc_class = context.scene.BIMRootProperties.ifc_class op.ifc_class = context.scene.BIMRootProperties.ifc_class
op.predefined_type = context.scene.BIMRootProperties.ifc_predefined_type op.predefined_type = context.scene.BIMRootProperties.ifc_predefined_type if ifc_predefined_types else ""
op.userdefined_type = context.scene.BIMRootProperties.ifc_userdefined_type op.userdefined_type = context.scene.BIMRootProperties.ifc_userdefined_type
def draw_class_dropdowns(self, context): def draw_class_dropdowns(self, context, ifc_predefined_types):
props = context.scene.BIMRootProperties props = context.scene.BIMRootProperties
row = self.layout.row() row = self.layout.row()
row.prop(props, "ifc_product") row.prop(props, "ifc_product")
row = self.layout.row() row = self.layout.row()
row.prop(props, "ifc_class") row.prop(props, "ifc_class")
if props.ifc_predefined_type: if ifc_predefined_types:
row = self.layout.row() row = self.layout.row()
row.prop(props, "ifc_predefined_type") row.prop(props, "ifc_predefined_type")
if props.ifc_predefined_type == "USERDEFINED": if ifc_predefined_types == "USERDEFINED":
row = self.layout.row() row = self.layout.row()
row.prop(props, "ifc_userdefined_type") row.prop(props, "ifc_userdefined_type")
row = self.layout.row() row = self.layout.row()