kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Fix importSVG.py: wrong position for certain ellipses (#5297)

Browse Source 
Ellipses and elliptical arcs with a y radius larger than their x radius would end up in the wrong position.
This commit is contained in:
Roy-043
2022-01-06 17:02:41 +01:00
committed by GitHub
parent ba3961574b
commit 6f970b197f
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1045,19 +1045,12 @@ class svgHandler(xml.sax.ContentHandler):
# angle1 - 0 * swapaxis * d90,
# angle1 + angledelta
# - 0 * swapaxis * d90)
_precision = 10**(-1*Draft.precision())
if swapaxis or xrotation > _precision:
m3 = FreeCAD.Matrix()
m3.move(vcenter)
# 90
rot90 = FreeCAD.Matrix(0, -1, 0, 0, 1, 0)
# swapaxism = FreeCAD.Matrix(0, 1, 0, 0, 1, 0)
if swapaxis:
m3 = m3.multiply(rot90)
m3.rotateZ(math.radians(-xrotation))
m3.move(vcenter.multiply(-1))
e1a.transform(m3)
seg = e1a.toShape()
if swapaxis:
seg.rotate(vcenter, Vector(0, 0, 1), 90)
_precision = 10**(-1*Draft.precision())
if abs(xrotation) > _precision:
seg.rotate(vcenter, Vector(0, 0, 1), -xrotation)
if sweepflag:
seg.reverse()
# DEBUG
@@ -1381,14 +1374,7 @@ class svgHandler(xml.sax.ContentHandler):
sh = Part.Ellipse(c, rx, ry).toShape()
else:
sh = Part.Ellipse(c, ry, rx).toShape()
m3 = FreeCAD.Matrix()
m3.move(c)
# 90
rot90 = FreeCAD.Matrix(0, -1, 0, 0, 1, 0)
m3 = m3.multiply(rot90)
m3.move(c.multiply(-1))
sh.transformShape(m3)
# sh = sh.transformGeometry(m3)
sh.rotate(c, Vector(0, 0, 1), 90)
if self.fill:
sh = Part.Wire([sh])
sh = Part.Face(sh)