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

importSVG support numbers only seperated through a minus sign

Browse Source 
in path definition. Like in files created by Adobe Ilustrator.
This commit is contained in:
Sebastian Hoogen 2012-05-03 11:08:40 +02:00
parent 2dc62d783e
commit 6e69faa86d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Draft/importSVG.py
View File

@ -256,7 +256,7 @@ def getsize(length,mode='discard',base=1):
elif mode == 'tuple':
return float(number),unit
elif mode == 'isabsolute':
return unit in ['mm','cm','in','px','pt']
return unit in ('mm','cm','in','px','pt')
elif mode == 'mm':
return float(number)*tomm[unit]
elif mode == 'css':
@ -525,9 +525,11 @@ class svgHandler(xml.sax.ContentHandler):
self.lastdim = obj
data['d']=[]
pathcommandsre=re.compile('\s*?([mMlLhHvVaAcCqQsStTzZ])\s*?([^mMlLhHvVaAcCqQsStTzZ]*)\s*?',re.DOTALL)
pointsre=re.compile('([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)',re.DOTALL)
for d,pointsstr in pathcommandsre.findall(' '.join(data['d'])):
relative = d.islower()
pointlist = [float(str1) for str1 in pointsstr.replace(',',' ').split()]
pointlist = [float(number) for number,exponent in pointsre.findall(pointsstr.replace(',',' '))]
if (d == "M" or d == "m"):
x = pointlist.pop(0)
y = pointlist.pop(0)