From de393746c70e40a5fa2aa431a71de6c14dd73c96 Mon Sep 17 00:00:00 2001
From: vocx-fc <vocx-fc@users.noreply.github.com>
Date: Wed, 8 Jul 2020 16:39:50 -0500
Subject: [PATCH] Draft: move getEllipse out of getSVG function

---
 src/Mod/Draft/getSVG.py | 50 ++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/Mod/Draft/getSVG.py b/src/Mod/Draft/getSVG.py
index 88f1fec91f..6e6d0826e1 100644
--- a/src/Mod/Draft/getSVG.py
+++ b/src/Mod/Draft/getSVG.py
@@ -210,6 +210,35 @@ def getCircle(plane,
     return get_circle(plane, fill, stroke, linewidth, lstyle, edge)
 
 
+def get_ellipse(plane,
+                fill, stroke, linewidth, lstyle,
+                edge):
+    """Get the SVG representation from an elliptical edge."""
+    cen = get_proj(edge.Curve.Center, plane)
+    mir = edge.Curve.MinorRadius
+    mar = edge.Curve.MajorRadius
+    svg = '<ellipse '
+    svg += 'cx="{}" cy="{}" '.format(cen.x, cen.y)
+    svg += 'rx="{}" ry="{}" '.format(mar, mir)
+    svg += 'stroke="{}" '.format(stroke)
+    svg += 'stroke-width="{} px" '.format(linewidth)
+    svg += 'style="'
+    svg += 'stroke-width:{};'.format(linewidth)
+    svg += 'stroke-miterlimit:4;'
+    svg += 'stroke-dasharray:{};'.format(lstyle)
+    svg += 'fill:{}'.format(fill) + '"'
+    svg += '/>\n'
+    return svg
+
+
+def getEllipse(plane,
+               fill, stroke, linewidth, lstyle,
+               edge):
+    """Get the SVG representation from an elliptical edge. DEPRECATED."""
+    utils.use_instead("get_ellipse")
+    return get_ellipse(plane, fill, stroke, linewidth, lstyle, edge)
+
+
 def get_path(obj, plane,
              fill, pathdata, stroke, linewidth, lstyle,
              fill_opacity=None,
@@ -301,7 +330,9 @@ def get_path(obj, plane,
                             return svg
                         elif len(e.Vertexes) == 1 and isellipse:
                             # Complete ellipse not only arc
-                            # svg = getEllipse(e)
+                            # svg = get_ellipse(plane,
+                            #                   fill, stroke, linewidth,
+                            #                   lstyle, edge)
                             # return svg
 
                             # Difference in angles
@@ -546,23 +577,6 @@ def getSVG(obj,
         if hasattr(obj, "ViewObject") and hasattr(obj.ViewObject, "DrawStyle"):
             lstyle = get_line_style(obj.ViewObject.DrawStyle, scale)
 
-    def getEllipse(edge):
-        cen = get_proj(edge.Curve.Center, plane)
-        mir = edge.Curve.MinorRadius
-        mar = edge.Curve.MajorRadius
-        svg = '<ellipse cx="' + str(cen.x)
-        svg += '" cy="' + str(cen.y)
-        svg += '" rx="' + str(mar)
-        svg += '" ry="' + str(mir)+'" '
-        svg += 'stroke="' + stroke + '" '
-        svg += 'stroke-width="' + str(linewidth) + ' px" '
-        svg += 'style="stroke-width:'+ str(linewidth)
-        svg += ';stroke-miterlimit:4'
-        svg += ';stroke-dasharray:' + lstyle
-        svg += ';fill:' + fill + '"'
-        svg += '/>\n'
-        return svg
-
     def getArrow(arrowtype,point,arrowsize,color,linewidth,angle=0):
         svg = ""
         if FreeCAD.GuiUp: