From 5b77001568f71d2f17f0a5a1a5b150478727648b Mon Sep 17 00:00:00 2001 From: Vukas Pajic <83825269+vulevukusej@users.noreply.github.com> Date: Wed, 29 Jun 2022 08:22:43 +0200 Subject: [PATCH] updated according to comments --- src/blenderbim/blenderbim/bim/helper.py | 2 +- .../ifcopenshell/util/element.py | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/helper.py b/src/blenderbim/blenderbim/bim/helper.py index 1934a088ab..6703bda0dc 100644 --- a/src/blenderbim/blenderbim/bim/helper.py +++ b/src/blenderbim/blenderbim/bim/helper.py @@ -33,7 +33,7 @@ def draw_attributes(props, layout, copy_operator=None): draw_attribute(attribute, row, copy_operator) -def draw_attribute(box, attribute, layout, copy_operator=None): +def draw_attribute(attribute, layout, copy_operator=None): value_name = attribute.get_value_name() if not value_name: layout.label(text=attribute.name) diff --git a/src/ifcopenshell-python/ifcopenshell/util/element.py b/src/ifcopenshell-python/ifcopenshell/util/element.py index 67088c60a1..49e56493f8 100644 --- a/src/ifcopenshell-python/ifcopenshell/util/element.py +++ b/src/ifcopenshell-python/ifcopenshell/util/element.py @@ -81,13 +81,8 @@ def get_properties(properties): if prop.is_a("IfcPropertySingleValue"): results[prop.Name] = prop.NominalValue.wrappedValue if prop.NominalValue else None elif prop.is_a("IfcPropertyEnumeratedValue"): - values = [] - for enum in prop.EnumerationValues: - values.append(enum.wrappedValue) - if values: - results[prop.Name] = str(values) if len(values)>1 else values[0] - else: - results[prop.Name] = None + values = [v.wrappedValue for v in prop.EnumerationValues] + results[prop.Name] = [v.wrappedValue for v in prop.EnumerationValues] or None elif prop.is_a("IfcComplexProperty"): data = {k: v for k, v in prop.get_info().items() if v is not None and k != "Name"} @@ -100,9 +95,9 @@ def get_properties(properties): def get_predefined_type(element): element_type = get_type(element) if element_type: - predefined_type = getattr(element_type, "ElementType", getattr(element_type, "ProcessType", None)) + predefined_type = getattr(element_type, "PredefinedType", None) if predefined_type == "USERDEFINED" or not predefined_type: - predefined_type = getattr(element_type, "ElementType", None) + predefined_type = getattr(element_type, "ElementType", getattr(element_type, "ProcessType", None)) if predefined_type and predefined_type != "NOTDEFINED": return predefined_type predefined_type = getattr(element, "PredefinedType", None)