Annotation and style-like changes

Author: rocky

mathics/builtin/box/graphics.py

@@ -692,26 +692,38 @@ def boxes_to_svg(self, elements=None, **options) -> str:
         svg_body = format_fn(self, elements, data=data, **options)
         return svg_body
 
-    def create_axes(self, elements, graphics_options, xmin, xmax, ymin, ymax):
+    def create_axes(self, elements, graphics_options, xmin, xmax, ymin, ymax) -> tuple:
+
+        # Note that Asymptote has special commands for drawing axes, like "xaxis"
+        # "yaxis", "xtick" "labelx", "labely". Entend our language
+        # here and use those in render-like routines.
+
         use_log_for_y_axis = graphics_options.get("System`LogPlot", False)
-        axes = graphics_options.get("System`Axes")
-        if axes is SymbolTrue:
+        axes_option = graphics_options.get("System`Axes")
+
+        if axes_option is SymbolTrue:
             axes = (True, True)
-        elif axes.has_form("List", 2):
-            axes = (axes.elements[0] is SymbolTrue, axes.elements[1] is SymbolTrue)
+        elif axes_option.has_form("List", 2):
+            axes = (
+                axes_option.elements[0] is SymbolTrue,
+                axes_option.elements[1] is SymbolTrue,
+            )
         else:
             axes = (False, False)
-        ticks_style = graphics_options.get("System`TicksStyle")
-        axes_style = graphics_options.get("System`AxesStyle")
+
+        ticks_style_option = graphics_options.get("System`TicksStyle")
+        axes_style_option = graphics_options.get("System`AxesStyle")
         label_style = graphics_options.get("System`LabelStyle")
-        if ticks_style.has_form("List", 2):
-            ticks_style = ticks_style.elements
+
+        if ticks_style_option.has_form("List", 2):
+            ticks_style = ticks_style_option.elements
         else:
-            ticks_style = [ticks_style] * 2
-        if axes_style.has_form("List", 2):
-            axes_style = axes_style.elements
+            ticks_style = [ticks_style_option] * 2
+
+        if axes_style_option.has_form("List", 2):
+            axes_style = axes_style_option.elements
         else:
-            axes_style = [axes_style] * 2
+            axes_style = [axes_style_option] * 2
 
         ticks_style = [elements.create_style(s) for s in ticks_style]
         axes_style = [elements.create_style(s) for s in axes_style]
@@ -723,12 +735,16 @@ def add_element(element):
             element.is_completely_visible = True
             elements.elements.append(element)
 
+        # Units seem to be in point size units
+
         ticks_x, ticks_x_small, origin_x = self.axis_ticks(xmin, xmax)
         ticks_y, ticks_y_small, origin_y = self.axis_ticks(ymin, ymax)
 
         axes_extra = 6
+
         tick_small_size = 3
         tick_large_size = 5
+
         tick_label_d = 2
 
         ticks_x_int = all(floor(x) == x for x in ticks_x)
@@ -791,8 +807,10 @@ def add_element(element):
                     )
                 )
                 ticks_lines = []
+
                 tick_label_style = ticks_style[index].clone()
                 tick_label_style.extend(label_style)
+
                 for x in ticks:
                     ticks_lines.append(
                         [
@@ -816,6 +834,7 @@ def add_element(element):
                         content = String(
                             "%g" % tick_value
                         )  # fix e.g. 0.6000000000000001
+
                     add_element(
                         InsetBox(
                             elements,
@@ -839,31 +858,32 @@ def add_element(element):
                 add_element(LineBox(elements, axes_style[0], lines=ticks_lines))
         return axes
 
-        """if axes[1]:
-            add_element(LineBox(elements, axes_style[1], lines=[[Coords(elements, pos=(origin_x,ymin), d=(0,-axes_extra)),
-                Coords(elements, pos=(origin_x,ymax), d=(0,axes_extra))]]))
-            ticks = []
-            tick_label_style = ticks_style[1].clone()
-            tick_label_style.extend(label_style)
-            for k in range(start_k_y, start_k_y+steps_y+1):
-                if k != origin_k_y:
-                    y = k * step_y
-                    if y > ymax:
-                        break
-                    pos = (origin_x,y)
-                    ticks.append([Coords(elements, pos=pos),
-                        Coords(elements, pos=pos, d=(tick_large_size,0))])
-                    add_element(InsetBox(elements, tick_label_style, content=Real(y), pos=Coords(elements, pos=pos,
-                        d=(-tick_label_d,0)), opos=(1,0)))
-            for k in range(start_k_y_small, start_k_y_small+steps_y_small+1):
-                if k % sub_y != 0:
-                    y = k * step_y_small
-                    if y > ymax:
-                        break
-                    pos = (origin_x,y)
-                    ticks.append([Coords(elements, pos=pos),
-                        Coords(elements, pos=pos, d=(tick_small_size,0))])
-            add_element(LineBox(elements, axes_style[1], lines=ticks))"""
+        # Old code?
+        # if axes[1]:
+        #     add_element(LineBox(elements, axes_style[1], lines=[[Coords(elements, pos=(origin_x,ymin), d=(0,-axes_extra)),
+        #         Coords(elements, pos=(origin_x,ymax), d=(0,axes_extra))]]))
+        #     ticks = []
+        #     tick_label_style = ticks_style[1].clone()
+        #     tick_label_style.extend(label_style)
+        #     for k in range(start_k_y, start_k_y+steps_y+1):
+        #         if k != origin_k_y:
+        #             y = k * step_y
+        #             if y > ymax:
+        #                 break
+        #             pos = (origin_x,y)
+        #             ticks.append([Coords(elements, pos=pos),
+        #                 Coords(elements, pos=pos, d=(tick_large_size,0))])
+        #             add_element(InsetBox(elements, tick_label_style, content=Real(y), pos=Coords(elements, pos=pos,
+        #                 d=(-tick_label_d,0)), opos=(1,0)))
+        #     for k in range(start_k_y_small, start_k_y_small+steps_y_small+1):
+        #         if k % sub_y != 0:
+        #             y = k * step_y_small
+        #             if y > ymax:
+        #                 break
+        #             pos = (origin_x,y)
+        #             ticks.append([Coords(elements, pos=pos),
+        #                 Coords(elements, pos=pos, d=(tick_small_size,0))])
+        #     add_element(LineBox(elements, axes_style[1], lines=ticks))
 
 
 class FilledCurveBox(_GraphicsElementBox):