From df3648a86402237de3c8193d658f8c1766dd0a9c Mon Sep 17 00:00:00 2001 From: Jonathan Wiedemann Date: Fri, 5 Feb 2016 02:08:23 +0100 Subject: [PATCH] Arch - little IFC Spreadsheet adjustement --- src/Mod/Arch/importIFC.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index bac7a5dbe..7dd5c3919 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -621,14 +621,6 @@ def insert(filename,docname,skip=[],only=[],root=None): # properties if pid in properties: - if hasattr(obj,"IfcAttributes"): - a = obj.IfcAttributes - for c in properties[pid].keys(): - for p in properties[pid][c]: - l = ifcfile[p] - if l.is_a("IfcPropertySingleValue"): - a[l.Name.encode("utf8")] = str(l.NominalValue) - obj.IfcAttributes = a if IMPORT_PROPERTIES and hasattr(obj,"IfcProperties") : ifc_spreadsheet = Arch.makeIfcSpreadsheet() n=2 @@ -656,6 +648,14 @@ def insert(filename,docname,skip=[],only=[],root=None): ifc_spreadsheet.set(str('E'+str(n)), str(l.NominalValue.Unit)) n += 1 obj.IfcProperties = ifc_spreadsheet + elif hasattr(obj,"IfcAttributes"): + a = obj.IfcAttributes + for c in properties[pid].keys(): + for p in properties[pid][c]: + l = ifcfile[p] + if l.is_a("IfcPropertySingleValue"): + a[l.Name.encode("utf8")] = str(l.NominalValue) + obj.IfcAttributes = a # color if FreeCAD.GuiUp and (pid in colors) and hasattr(obj.ViewObject,"ShapeColor"):