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

small fixes to draft SVG import (shoogen)

Browse Source
This commit is contained in:
Yorik van Havre 2012-01-07 13:39:50 -02:00
parent d54d644c0e
commit 649abff877
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,8 +601,8 @@ class svgHandler(xml.sax.ContentHandler):
else: else:
currentvec = Vector(point[2],-point[3],0) currentvec = Vector(point[2],-point[3],0)
pole2 = Vector(point[0],-point[1],0) pole2 = Vector(point[0],-point[1],0)
if lastpole: if lastpole is not None and lastpole[0]=='cubic':
pole1 = lastvec.sub(lastpole).add(lastvec) pole1 = lastvec.sub(lastpole[1]).add(lastvec)
else: else:
pole1 = lastvec pole1 = lastvec
else: #not smooth else: #not smooth
@ -630,7 +630,7 @@ class svgHandler(xml.sax.ContentHandler):
seg = b.toShape() seg = b.toShape()
print "connect ",lastvec,currentvec print "connect ",lastvec,currentvec
lastvec = currentvec lastvec = currentvec
lastpole = pole2 lastpole = ('cubic',pole2)
path.append(seg) path.append(seg)
point = [] point = []
@ -640,8 +640,8 @@ class svgHandler(xml.sax.ContentHandler):
currentvec = lastvec.add(Vector(point[0],-point[1],0)) currentvec = lastvec.add(Vector(point[0],-point[1],0))
else: else:
currentvec = Vector(point[0],-point[1],0) currentvec = Vector(point[0],-point[1],0)
if lastpole: if lastpole is not None and lastpole[0]=='quadratic':
pole1 = lastvec.sub(lastpole).add(lastvec) pole1 = lastvec.sub(lastpole[1]).add(lastvec)
else: else:
pole1 = lastvec pole1 = lastvec
else: #not smooth else: #not smooth
@ -663,7 +663,7 @@ class svgHandler(xml.sax.ContentHandler):
seg = b.toShape() seg = b.toShape()
print "connect ",lastvec,currentvec print "connect ",lastvec,currentvec
lastvec = currentvec lastvec = currentvec
lastpole = pole1 lastpole = ('quadratic',pole1)
path.append(seg) path.append(seg)
point = [] point = []