Merge pull request #1385 from mathics/svg-linting

Small lint-like things
Move _SVGTransform out of graphics

Author: rocky

mathics/builtin/graphics.py

@@ -335,29 +335,6 @@ def _extract_graphics(graphics, format, evaluation):
     return xmin, xmax, ymin, ymax, ox, oy, ex, ey, code
 
 
-class _SVGTransform:
-    def __init__(self):
-        self.transforms = []
-
-    def matrix(self, a, b, c, d, e, f):
-        # a c e
-        # b d f
-        # 0 0 1
-        self.transforms.append("matrix(%f, %f, %f, %f, %f, %f)" % (a, b, c, d, e, f))
-
-    def translate(self, x, y):
-        self.transforms.append("translate(%f, %f)" % (x, y))
-
-    def scale(self, x, y):
-        self.transforms.append("scale(%f, %f)" % (x, y))
-
-    def rotate(self, x):
-        self.transforms.append("rotate(%f)" % x)
-
-    def apply(self, svg):
-        return '<g transform="%s">%s</g>' % (" ".join(self.transforms), svg)
-
-
 class _ASYTransform:
     _template = """
     add(%s * (new picture() {
@@ -416,7 +393,6 @@ def apply(self, graphics, evaluation, options):
         new_leaves = []
         options_set = set(options.keys())
         for leaf in graphics.leaves:
-            new_leaf = leaf
             leaf_name = leaf.get_head_name()
             if leaf_name == "System`Rule" and str(leaf.leaves[0]) in options_set:
                 continue
@@ -1366,64 +1342,6 @@ def _arc_params(self):
 
         return x, y, abs(rx), abs(ry), sx, sy, ex, ey, large_arc
 
-    # FIXME: Why do we need this? If so,
-    # figure out how to put in svg.py
-    # --------------------------------
-    # def to_svg(self, offset=None):
-    #     if self.arc is None:
-    #         return super(_ArcBox, self).to_svg(offset)
-
-    #     x, y, rx, ry, sx, sy, ex, ey, large_arc = self._arc_params()
-
-    #     format_fn = lookup_method(self, "svg")
-    #     if format_fn is not None:
-    #         return format_fn(self, offset)
-    #     def path(closed):
-    #         if closed:
-    #             yield "M %f,%f" % (x, y)
-    #             yield "L %f,%f" % (sx, sy)
-    #         else:
-    #             yield "M %f,%f" % (sx, sy)
-
-    #         yield "A %f,%f,0,%d,0,%f,%f" % (rx, ry, large_arc, ex, ey)
-
-    #         if closed:
-    #             yield "Z"
-
-    #     l = self.style.get_line_width(face_element=self.face_element)
-    #     style = create_css(self.edge_color, self.face_color, stroke_width=l)
-    #     return '<path d="%s" style="%s" />' % (" ".join(path(self.face_element)), style)
-
-    def to_asy(self):
-        if self.arc is None:
-            return super(_ArcBox, self).to_asy()
-
-        x, y, rx, ry, sx, sy, ex, ey, large_arc = self._arc_params()
-
-        def path(closed):
-            if closed:
-                yield "(%s,%s)--(%s,%s)--" % tuple(
-                    asy_number(t) for t in (x, y, sx, sy)
-                )
-
-            yield "arc((%s,%s), (%s, %s), (%s, %s))" % tuple(
-                asy_number(t) for t in (x, y, sx, sy, ex, ey)
-            )
-
-            if closed:
-                yield "--cycle"
-
-        l = self.style.get_line_width(face_element=self.face_element)
-        pen = create_pens(
-            edge_color=self.edge_color,
-            face_color=self.face_color,
-            stroke_width=l,
-            is_face_element=self.face_element,
-        )
-        command = "filldraw" if self.face_element else "draw"
-        return "%s(%s, %s);" % (command, "".join(path(self.face_element)), pen)
-
-
 class DiskBox(_ArcBox):
     face_element = True
 

mathics/formatter/svg.py

@@ -20,12 +20,35 @@
     RectangleBox,
     _RoundBox,
     _svg_bezier,
-    _SVGTransform,
 )
 
 from mathics.core.formatter import lookup_method, add_conversion_fn
 
 
+class _SVGTransform:
+    def __init__(self):
+        from trepan.api import debug; debug()
+        self.transforms = []
+
+    def matrix(self, a, b, c, d, e, f):
+        # a c e
+        # b d f
+        # 0 0 1
+        self.transforms.append("matrix(%f, %f, %f, %f, %f, %f)" % (a, b, c, d, e, f))
+
+    def translate(self, x, y):
+        self.transforms.append("translate(%f, %f)" % (x, y))
+
+    def scale(self, x, y):
+        self.transforms.append("scale(%f, %f)" % (x, y))
+
+    def rotate(self, x):
+        self.transforms.append("rotate(%f)" % x)
+
+    def apply(self, svg):
+        return '<g transform="%s">%s</g>' % (" ".join(self.transforms), svg)
+
+
 def create_css(
     edge_color=None, face_color=None, stroke_width=None, font_color=None, opacity=1.0
 ) -> str:
@@ -76,8 +99,8 @@ def polygon(points):
 
 
 def beziercurvebox(self, offset=None):
-    l = self.style.get_line_width(face_element=False)
-    style = create_css(edge_color=self.edge_color, stroke_width=l)
+    line_width = self.style.get_line_width(face_element=False)
+    style = create_css(edge_color=self.edge_color, stroke_width=line_width)
 
     svg = ""
     for line in self.lines:
@@ -91,9 +114,9 @@ def beziercurvebox(self, offset=None):
 
 
 def filledcurvebox(self, offset=None):
-    l = self.style.get_line_width(face_element=False)
+    line_width = self.style.get_line_width(face_element=False)
     style = create_css(
-        edge_color=self.edge_color, face_color=self.face_color, stroke_width=l
+        edge_color=self.edge_color, face_color=self.face_color, stroke_width=line_width
     )
 
     def components():
@@ -110,7 +133,6 @@ def components():
 
 add_conversion_fn(FilledCurveBox)
 
-# FIXME figure out how we can add this.
 def graphicsbox(self, leaves=None, **options) -> str:
         if not leaves:
             leaves = self._leaves
@@ -220,8 +242,8 @@ def insetbox(self, offset=None):
 
 
 def linebox(self, offset=None):
-    l = self.style.get_line_width(face_element=False)
-    style = create_css(edge_color=self.edge_color, stroke_width=l)
+    line_width = self.style.get_line_width(face_element=False)
+    style = create_css(edge_color=self.edge_color, stroke_width=line_width)
     svg = ""
     for line in self.lines:
         svg += '<polyline points="%s" style="%s" />' % (
@@ -261,13 +283,13 @@ def pointbox(self, offset=None):
 
 
 def polygonbox(self, offset=None):
-    l = self.style.get_line_width(face_element=True)
+    line_width = self.style.get_line_width(face_element=True)
     if self.vertex_colors is None:
         face_color = self.face_color
     else:
         face_color = None
     style = create_css(
-        edge_color=self.edge_color, face_color=face_color, stroke_width=l
+        edge_color=self.edge_color, face_color=face_color, stroke_width=line_width
     )
     svg = ""
     if self.vertex_colors is not None:
@@ -292,7 +314,7 @@ def polygonbox(self, offset=None):
 
 
 def rectanglebox(self, offset=None):
-    l = self.style.get_line_width(face_element=True)
+    line_width = self.style.get_line_width(face_element=True)
     x1, y1 = self.p1.pos()
     x2, y2 = self.p2.pos()
     xmin = min(x1, x2)
@@ -302,7 +324,7 @@ def rectanglebox(self, offset=None):
     if offset:
         x1, x2 = x1 + offset[0], x2 + offset[0]
         y1, y2 = y1 + offset[1], y2 + offset[1]
-    style = create_css(self.edge_color, self.face_color, l)
+    style = create_css(self.edge_color, self.face_color, line_width)
     return '<rect x="%f" y="%f" width="%f" height="%f" style="%s" />' % (
         xmin,
         ymin,
@@ -321,8 +343,8 @@ def _roundbox(self, offset=None):
     rx, ry = self.r.pos()
     rx -= x
     ry = y - ry
-    l = self.style.get_line_width(face_element=self.face_element)
-    style = create_css(self.edge_color, self.face_color, stroke_width=l)
+    line_width = self.style.get_line_width(face_element=self.face_element)
+    style = create_css(self.edge_color, self.face_color, stroke_width=line_width)
     return '<ellipse cx="%f" cy="%f" rx="%f" ry="%f" style="%s" />' % (
         x,
         y,