Merge pull request #109 from wood-galaxy/bim-ifcproperty-6

Arch : IFC : Handle case where NominalValue is None
FreeCAD · Mar 3, 2016 · b825dcd · b825dcd
2 parents 5139691 + 219e212
commit b825dcd
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py
@@ -631,22 +631,23 @@ def insert(filename,docname,skip=[],only=[],root=None):
                         for p in properties[pid][c]:
                             l = ifcfile[p]
                             if l.is_a("IfcPropertySingleValue"):
-                                if IMPORT_PROPERTIES :
+                                if DEBUG :
+                                    print("property name",l.Name,type(l.Name))
+                                ifc_spreadsheet.set(str('A'+str(n)), catname.encode("utf8"))
+                                ifc_spreadsheet.set(str('B'+str(n)), l.Name.encode("utf8"))
+                                if l.NominalValue :
                                     if DEBUG :
-                                        print("property name",l.Name,type(l.Name))
                                         print("property NominalValue",l.NominalValue.is_a(),type(l.NominalValue.is_a()))
                                         print("property NominalValue.wrappedValue",l.NominalValue.wrappedValue,type(l.NominalValue.wrappedValue))
                                         #print("l.NominalValue.Unit",l.NominalValue.Unit,type(l.NominalValue.Unit))
-                                    ifc_spreadsheet.set(str('A'+str(n)), catname.encode("utf8"))
-                                    ifc_spreadsheet.set(str('B'+str(n)), l.Name.encode("utf8"))
                                     ifc_spreadsheet.set(str('C'+str(n)), l.NominalValue.is_a())
                                     if l.NominalValue.is_a() in ['IfcLabel','IfcText','IfcIdentifier','IfcDescriptiveMeasure']:
                                         ifc_spreadsheet.set(str('D'+str(n)), "'" + str(l.NominalValue.wrappedValue.encode("utf8")))
                                     else :
                                         ifc_spreadsheet.set(str('D'+str(n)), str(l.NominalValue.wrappedValue))
                                     if hasattr(l.NominalValue,'Unit') :
                                         ifc_spreadsheet.set(str('E'+str(n)), str(l.NominalValue.Unit))
-                                    n += 1
+                                n += 1
                         obj.IfcProperties = ifc_spreadsheet
                 elif hasattr(obj,"IfcAttributes"):
                     a = obj.IfcAttributes