Merge pull request #1381 from mathics/TicksStyle-3D

TicksStyle 3D

Author: rocky

mathics/builtin/drawing/graphics3d.py

@@ -429,17 +429,17 @@ def calc_dimensions(final_pass=True):
 
         xmin, xmax, ymin, ymax, zmin, zmax, boxscale = calc_dimensions(final_pass=False)
 
-        axes, ticks = self.create_axes(
+        axes, ticks, ticks_style = self.create_axes(
             elements, graphics_options, xmin, xmax, ymin, ymax, zmin, zmax, boxscale
         )
 
-        return elements, axes, ticks, calc_dimensions, boxscale
+        return elements, axes, ticks, ticks_style, calc_dimensions, boxscale
 
     def boxes_to_tex(self, leaves=None, **options):
         if not leaves:
             leaves = self._leaves
 
-        elements, axes, ticks, calc_dimensions, boxscale = self._prepare_elements(
+        elements, axes, ticks, ticks_style, calc_dimensions, boxscale = self._prepare_elements(
             leaves, options, max_width=450
         )
 
@@ -635,10 +635,12 @@ def boxes_to_mathml(self, leaves=None, **options):
         if not leaves:
             leaves = self._leaves
 
-        elements, axes, ticks, calc_dimensions, boxscale = self._prepare_elements(
+        elements, axes, ticks, ticks_style, calc_dimensions, boxscale = self._prepare_elements(
             leaves, options
         )
 
+        js_ticks_style = [s.to_js() for s in ticks_style]
+
         elements._apply_boxscaling(boxscale)
 
         # FIXME: json is the only thing we can convert MathML into.
@@ -655,7 +657,7 @@ def boxes_to_mathml(self, leaves=None, **options):
         json_repr = json.dumps(
             {
                 "elements": json_repr,
-                "axes": {"hasaxes": axes, "ticks": ticks},
+                "axes": {"hasaxes": axes, "ticks": ticks, "ticks_style": js_ticks_style},
                 "extent": {
                     "xmin": xmin,
                     "xmax": xmax,
@@ -691,20 +693,30 @@ def create_axes(
         ticks_style = graphics_options.get("System`TicksStyle")
         axes_style = graphics_options.get("System`AxesStyle")
         label_style = graphics_options.get("System`LabelStyle")
-        if ticks_style.has_form("List", 3):
+
+        # FIXME: Doesn't handle GrayScale
+        if ticks_style.has_form("List", 1, 2, 3):
             ticks_style = ticks_style.leaves
-        else:
+        elif ticks_style.has_form("RGBColor", None):
             ticks_style = [ticks_style] * 3
-        if axes_style.has_form("List", 3):
+        else:
+            ticks_style = []
+
+        if axes_style.has_form("List", 1, 2, 3):
             axes_style = axes_style.leaves
         else:
             axes_style = [axes_style] * 3
 
-        ticks_style = [elements.create_style(s) for s in ticks_style]
+        # FIXME: Not quite right. We only handle color
+        ticks_style = [elements.create_style(s).get_style(_Color, face_element=False)[0] for s in ticks_style]
+
         axes_style = [elements.create_style(s) for s in axes_style]
         label_style = elements.create_style(label_style)
-        ticks_style[0].extend(axes_style[0])
-        ticks_style[1].extend(axes_style[1])
+
+        # For later
+        # ticks_style[0].extend(axes_style[0])
+        # ticks_style[1].extend(axes_style[1])
+        # ticks_style[2].extend(axes_style[2])
 
         ticks = [
             self.axis_ticks(xmin, xmax),
@@ -734,7 +746,7 @@ def create_axes(
             for i, t in enumerate(ticks)
         ]
 
-        return axes, ticks
+        return axes, ticks, ticks_style
 
     def get_boundbox_lines(self, xmin, xmax, ymin, ymax, zmin, zmax):
         return [