suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arch: on ifc import do no longer decode unicode strings before encode them

Browse Source
This commit is contained in:
Bernd Hahnebach 2015-12-03 11:12:59 +01:00 committed by Yorik van Havre
parent cf1c02271f
commit 32624cbe94
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Arch/importIFC.py
View File

@ -419,7 +419,7 @@ def insert(filename,docname,skip=[],only=[],root=None):
if DEBUG: print count+1,"/",len(products)," creating object #",pid," : ",ptype,
name = str(ptype[3:])
if product.Name:
name = product.Name.decode("unicode_escape").encode("utf8")
name = product.Name.encode("utf8")
if PREFIX_NUMBERS: name = "ID" + str(pid) + " " + name
obj = None
baseobj = None
@ -594,7 +594,7 @@ def insert(filename,docname,skip=[],only=[],root=None):
for p in properties[pid]:
o = ifcfile[p]
if o.is_a("IfcPropertySingleValue"):
a[o.Name.decode("unicode_escape").encode("utf8")] = str(o.NominalValue)
a[o.Name.encode("utf8")] = str(o.NominalValue)
obj.IfcAttributes = a
# color
@ -729,7 +729,7 @@ def insert(filename,docname,skip=[],only=[],root=None):
if "IfcAnnotation" in SKIP: continue # preferences-set type skip list
name = "Annotation"
if annotation.Name:
name = annotation.Name.decode("unicode_escape").encode("utf8")
name = annotation.Name.encode("utf8")
if PREFIX_NUMBERS: name = "ID" + str(aid) + " " + name
shapes2d = []
for repres in annotation.Representation.Representations:
@ -752,7 +752,7 @@ def insert(filename,docname,skip=[],only=[],root=None):
for material in materials:
name = "Material"
if material.Name:
name = material.Name.decode("unicode_escape").encode("utf8")
name = material.Name.encode("utf8")
if MERGE_MATERIALS and (name in fcmats.keys()):
mat = fcmats[name]
else: