Skip to content

Commit c260574

Browse files
committed
Hacky TickStyle for colors
1 parent 7cac9bc commit c260574

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

mathics/builtin/drawing/graphics3d.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -429,17 +429,17 @@ def calc_dimensions(final_pass=True):
429429

430430
xmin, xmax, ymin, ymax, zmin, zmax, boxscale = calc_dimensions(final_pass=False)
431431

432-
axes, ticks = self.create_axes(
432+
axes, ticks, ticks_style = self.create_axes(
433433
elements, graphics_options, xmin, xmax, ymin, ymax, zmin, zmax, boxscale
434434
)
435435

436-
return elements, axes, ticks, calc_dimensions, boxscale
436+
return elements, axes, ticks, ticks_style, calc_dimensions, boxscale
437437

438438
def boxes_to_tex(self, leaves=None, **options):
439439
if not leaves:
440440
leaves = self._leaves
441441

442-
elements, axes, ticks, calc_dimensions, boxscale = self._prepare_elements(
442+
elements, axes, ticks, ticks_style, calc_dimensions, boxscale = self._prepare_elements(
443443
leaves, options, max_width=450
444444
)
445445

@@ -635,10 +635,12 @@ def boxes_to_mathml(self, leaves=None, **options):
635635
if not leaves:
636636
leaves = self._leaves
637637

638-
elements, axes, ticks, calc_dimensions, boxscale = self._prepare_elements(
638+
elements, axes, ticks, ticks_style, calc_dimensions, boxscale = self._prepare_elements(
639639
leaves, options
640640
)
641641

642+
js_ticks_style = [s.to_js() for s in ticks_style]
643+
642644
elements._apply_boxscaling(boxscale)
643645

644646
# FIXME: json is the only thing we can convert MathML into.
@@ -655,7 +657,7 @@ def boxes_to_mathml(self, leaves=None, **options):
655657
json_repr = json.dumps(
656658
{
657659
"elements": json_repr,
658-
"axes": {"hasaxes": axes, "ticks": ticks},
660+
"axes": {"hasaxes": axes, "ticks": ticks, "ticks_style": js_ticks_style},
659661
"extent": {
660662
"xmin": xmin,
661663
"xmax": xmax,
@@ -700,11 +702,16 @@ def create_axes(
700702
else:
701703
axes_style = [axes_style] * 3
702704

703-
ticks_style = [elements.create_style(s) for s in ticks_style]
705+
# FIXME: Not quite right
706+
ticks_style = [elements.create_style(s).get_style(_Color, face_element=False)[0] for s in ticks_style]
707+
704708
axes_style = [elements.create_style(s) for s in axes_style]
705709
label_style = elements.create_style(label_style)
706-
ticks_style[0].extend(axes_style[0])
707-
ticks_style[1].extend(axes_style[1])
710+
711+
# For later
712+
# ticks_style[0].extend(axes_style[0])
713+
# ticks_style[1].extend(axes_style[1])
714+
# ticks_style[2].extend(axes_style[2])
708715

709716
ticks = [
710717
self.axis_ticks(xmin, xmax),
@@ -734,7 +741,7 @@ def create_axes(
734741
for i, t in enumerate(ticks)
735742
]
736743

737-
return axes, ticks
744+
return axes, ticks, ticks_style
738745

739746
def get_boundbox_lines(self, xmin, xmax, ymin, ymax, zmin, zmax):
740747
return [

0 commit comments

Comments
 (0)