Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Fix BarChart ignoring include_numbers in y_axis_config (#5015)

Rızgar Ozan0e0b14bceabf
diff --git a/manim/mobject/graphing/coordinate_systems.py b/manim/mobject/graphing/coordinate_systems.py
index 6b8237827..7dfe6f447 100644
--- a/manim/mobject/graphing/coordinate_systems.py
+++ b/manim/mobject/graphing/coordinate_systems.py
@@ -2008,7 +2008,8 @@ class Axes(VGroup, CoordinateSystem, metaclass=ConvertToOpenGL):
@staticmethod
def _update_default_configs(
- default_configs: tuple[dict[Any, Any]], passed_configs: tuple[dict[Any, Any]]
+ default_configs: tuple[dict[Any, Any], ...],
+ passed_configs: tuple[dict[Any, Any] | None, ...],
) -> None:
"""Takes in two tuples of dicts and return modifies the first such that values from
``passed_configs`` overwrite values in ``default_configs``. If a key does not exist
diff --git a/manim/mobject/graphing/probability.py b/manim/mobject/graphing/probability.py
index 0801fda25..5c2ed8331 100644
--- a/manim/mobject/graphing/probability.py
+++ b/manim/mobject/graphing/probability.py
@@ -321,8 +321,10 @@ class BarChart(Axes):
x_length = min(len(self.values), config.frame_width - 2)
x_axis_config = {"font_size": 24, "label_constructor": Tex}
+ y_axis_config = {"include_numbers": True}
self._update_default_configs(
- (x_axis_config,), (kwargs.pop("x_axis_config", None),)
+ (x_axis_config, y_axis_config),
+ (kwargs.pop("x_axis_config", None), kwargs.pop("y_axis_config", None)),
)
self.bars: VGroup = VGroup()
@@ -335,6 +337,7 @@ class BarChart(Axes):
x_length=x_length,
y_length=y_length,
x_axis_config=x_axis_config,
+ y_axis_config=y_axis_config,
tips=kwargs.pop("tips", False),
**kwargs,
)
@@ -344,8 +347,6 @@ class BarChart(Axes):
if self.bar_names is not None:
self._add_x_axis_labels()
- self.y_axis.add_numbers()
-
def _update_colors(self) -> None:
"""Initialize the colors of the bars of the chart.
diff --git a/tests/module/mobject/graphing/test_probability.py b/tests/module/mobject/graphing/test_probability.py
new file mode 100644
index 000000000..63433146b
--- /dev/null
+++ b/tests/module/mobject/graphing/test_probability.py
@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+from manim import BarChart, DecimalNumber, VGroup
+
+
+def _number_groups(axis):
+ """Return the groups of number labels attached to ``axis``."""
+ return [
+ mob
+ for mob in axis.submobjects
+ if isinstance(mob, VGroup)
+ and len(mob) > 0
+ and all(isinstance(sub, DecimalNumber) for sub in mob)
+ ]
+
+
+def test_barchart_y_axis_include_numbers_false():
+ chart = BarChart(
+ values=[1, 2, 3],
+ y_axis_config={"include_numbers": False},
+ )
+ assert _number_groups(chart.y_axis) == []
+
+
+def test_barchart_y_axis_numbers_are_added_once():
+ # Keep the default label constructor: DecimalNumber caches digit mobjects
+ # globally by string, so a non-default one here leaks into later tests.
+ chart = BarChart(
+ values=[1, 2, 3],
+ y_axis_config={"include_numbers": True},
+ )
+ assert len(_number_groups(chart.y_axis)) == 1