From 649abff877a4abf6d38fe4786a4d6a9bb7622a8f Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 7 Jan 2012 13:39:50 -0200 Subject: [PATCH] small fixes to draft SVG import (shoogen) --- src/Mod/Draft/importSVG.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Draft/importSVG.py b/src/Mod/Draft/importSVG.py index ae560f138..a45c3b5bf 100644 --- a/src/Mod/Draft/importSVG.py +++ b/src/Mod/Draft/importSVG.py @@ -601,8 +601,8 @@ class svgHandler(xml.sax.ContentHandler): else: currentvec = Vector(point[2],-point[3],0) pole2 = Vector(point[0],-point[1],0) - if lastpole: - pole1 = lastvec.sub(lastpole).add(lastvec) + if lastpole is not None and lastpole[0]=='cubic': + pole1 = lastvec.sub(lastpole[1]).add(lastvec) else: pole1 = lastvec else: #not smooth @@ -630,7 +630,7 @@ class svgHandler(xml.sax.ContentHandler): seg = b.toShape() print "connect ",lastvec,currentvec lastvec = currentvec - lastpole = pole2 + lastpole = ('cubic',pole2) path.append(seg) point = [] @@ -640,8 +640,8 @@ class svgHandler(xml.sax.ContentHandler): currentvec = lastvec.add(Vector(point[0],-point[1],0)) else: currentvec = Vector(point[0],-point[1],0) - if lastpole: - pole1 = lastvec.sub(lastpole).add(lastvec) + if lastpole is not None and lastpole[0]=='quadratic': + pole1 = lastvec.sub(lastpole[1]).add(lastvec) else: pole1 = lastvec else: #not smooth @@ -663,7 +663,7 @@ class svgHandler(xml.sax.ContentHandler): seg = b.toShape() print "connect ",lastvec,currentvec lastvec = currentvec - lastpole = pole1 + lastpole = ('quadratic',pole1) path.append(seg) point = []