Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Fix tick issues and improve tick location (#1614)

Ryan McCauleya80217d4a303
diff --git a/manim/mobject/coordinate_systems.py b/manim/mobject/coordinate_systems.py
index 6352e0cee..d05a548df 100644
--- a/manim/mobject/coordinate_systems.py
+++ b/manim/mobject/coordinate_systems.py
@@ -974,7 +974,11 @@ class Axes(VGroup, CoordinateSystem):
VGroup.__init__(self, **kwargs)
CoordinateSystem.__init__(self, x_range, y_range, x_length, y_length)
- self.axis_config = {"include_tip": tips, "numbers_to_exclude": [0]}
+ self.axis_config = {
+ "include_tip": tips,
+ "numbers_to_exclude": [0],
+ "exclude_origin_tick": True,
+ }
self.x_axis_config = {}
self.y_axis_config = {"rotation": 90 * DEGREES, "label_direction": LEFT}
diff --git a/manim/mobject/number_line.py b/manim/mobject/number_line.py
index dcae81a2e..07a8886d7 100644
--- a/manim/mobject/number_line.py
+++ b/manim/mobject/number_line.py
@@ -1,9 +1,7 @@
"""Mobject representing a number line."""
-
__all__ = ["NumberLine", "UnitInterval", "NumberLineOld"]
-
import operator as op
import numpy as np
@@ -22,7 +20,9 @@ from ..utils.space_ops import normalize
class NumberLine(Line):
- """Creates a number line with tick marks.
+ """Creates a number line with tick marks. Number ranges that include both negative and
+ positive values will be generated from the 0 point, and may not include a tick at the min / max
+ values as the tick locations are dependent on the step size.
Parameters
----------
@@ -100,6 +100,7 @@ class NumberLine(Line):
numbers_to_include=None,
# temp, because DecimalNumber() needs to be updated
number_scale_value=0.75,
+ exclude_origin_tick=False,
**kwargs
):
# avoid mutable arguments in defaults
@@ -131,6 +132,7 @@ class NumberLine(Line):
self.tick_size = tick_size
self.numbers_with_elongated_ticks = numbers_with_elongated_ticks
self.longer_tick_multiple = longer_tick_multiple
+ self.exclude_origin_tick = exclude_origin_tick
# visuals
self.stroke_width = stroke_width
self.rotation = rotation
@@ -210,7 +212,21 @@ class NumberLine(Line):
x_max = self.x_max
else:
x_max = self.x_max + 1e-6
- return np.arange(self.x_min, x_max, self.x_step)
+
+ # Handle cases where min and max are both positive or both negative
+ if self.x_min < x_max < 0 or self.x_max > self.x_min > 0:
+ return np.arange(self.x_min, x_max, self.x_step)
+
+ start_point = 0
+ if self.exclude_origin_tick:
+ start_point += self.x_step
+
+ x_min_segment = (
+ np.arange(start_point, np.abs(self.x_min) + 1e-6, self.x_step) * -1
+ )
+ x_max_segment = np.arange(start_point, x_max, self.x_step)
+
+ return np.unique(np.concatenate((x_min_segment, x_max_segment)))
def number_to_point(self, number):
alpha = float(number - self.x_min) / (self.x_max - self.x_min)
diff --git a/tests/test_graphical_units/test_axes.py b/tests/test_graphical_units/test_axes.py
index 6a84cbf4b..f8915379e 100644
--- a/tests/test_graphical_units/test_axes.py
+++ b/tests/test_graphical_units/test_axes.py
@@ -14,6 +14,7 @@ class AxesTest(Scene):
x_length=6,
y_length=6,
color=WHITE,
+ axis_config={"exclude_origin_tick": False},
)
labels = graph.get_axis_labels()
self.add(graph, labels)
diff --git a/tests/test_graphical_units/test_threed.py b/tests/test_graphical_units/test_threed.py
index 931fb2490..baa00f1a9 100644
--- a/tests/test_graphical_units/test_threed.py
+++ b/tests/test_graphical_units/test_threed.py
@@ -48,7 +48,7 @@ class TorusTest(ThreeDScene):
class AxesTest(ThreeDScene):
def construct(self):
- self.add(ThreeDAxes())
+ self.add(ThreeDAxes(axis_config={"exclude_origin_tick": False}))
class CameraMoveTest(ThreeDScene):
diff --git a/tests/test_ticks.py b/tests/test_ticks.py
new file mode 100644
index 000000000..545a47963
--- /dev/null
+++ b/tests/test_ticks.py
@@ -0,0 +1,54 @@
+import numpy as np
+
+from manim import PI, Axes, NumberLine
+
+
+def test_duplicate_ticks_removed_for_axes():
+ axis = NumberLine(
+ x_range=[-10, 10],
+ )
+ ticks = axis.get_tick_range()
+ assert np.unique(ticks).size == ticks.size
+
+
+def test_ticks_not_generated_on_origin_for_axes():
+ axes = Axes(
+ x_range=[-10, 10], y_range=[-10, 10], axis_config={"include_ticks": True}
+ )
+
+ x_axis_range = axes.x_axis.get_tick_range()
+ y_axis_range = axes.y_axis.get_tick_range()
+
+ assert 0 not in x_axis_range
+ assert 0 not in y_axis_range
+
+
+def test_expected_ticks_generated():
+ axes = Axes(x_range=[-2, 2], y_range=[-2, 2], axis_config={"include_ticks": True})
+ x_axis_range = axes.x_axis.get_tick_range()
+ y_axis_range = axes.y_axis.get_tick_range()
+
+ assert 1 in x_axis_range
+ assert 1 in y_axis_range
+ assert -1 in x_axis_range
+ assert -1 in y_axis_range
+
+
+def test_ticks_generated_from_origin_for_axes():
+ axes = Axes(
+ x_range=[-PI, PI], y_range=[-PI, PI], axis_config={"include_ticks": True}
+ )
+ x_axis_range = axes.x_axis.get_tick_range()
+ y_axis_range = axes.y_axis.get_tick_range()
+
+ assert -2 in x_axis_range
+ assert -1 in x_axis_range
+ assert 0 not in x_axis_range
+ assert 1 in x_axis_range
+ assert 2 in x_axis_range
+
+ assert -2 in y_axis_range
+ assert -1 in y_axis_range
+ assert 0 not in y_axis_range
+ assert 1 in y_axis_range
+ assert 2 in y_axis_range