Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Removed deprecated method ``get_center_point`` and parameters ``azimuth_label_scale``, ``number_scale_value``, ``label_scale``, ``scale_factor``, ``size``, ``x_min``, ``x_max``, ``delta_x``, ``y_min``, ``y_max``, ``delta_y`` (#2245)

Jan-Hendrik Müllere24b71e1f11c
diff --git a/manim/mobject/coordinate_systems.py b/manim/mobject/coordinate_systems.py
index ddefc8d62..ad56bcbff 100644
--- a/manim/mobject/coordinate_systems.py
+++ b/manim/mobject/coordinate_systems.py
@@ -223,17 +223,6 @@ class CoordinateSystem:
def get_axis(self, index):
return self.get_axes()[index]
- @deprecated(since="v0.10.0", until="v0.11.0", message="Use get_origin instead.")
- def get_center_point(self) -> np.ndarray:
- """Gets the origin of :class:`~.Axes`.
-
- Returns
- -------
- np.ndarray
- The center point.
- """
- return self.coords_to_point(0, 0)
-
def get_origin(self) -> np.ndarray:
"""Gets the origin of :class:`~.Axes`.
@@ -1589,7 +1578,7 @@ class CoordinateSystem:
ax = Axes(
x_range=[0, 8.0, 1],
y_range=[-1, 1, 0.2],
- axis_config={"number_scale_value": 0.5},
+ axis_config={"font_size": 24},
).add_coordinates()
curve = ax.plot(lambda x: np.sin(x) / np.e ** 2 * x)
@@ -2586,12 +2575,6 @@ class PolarPlane(Axes):
self.add(polarplane_pi)
"""
- @deprecated_params(
- params="azimuth_label_scale",
- since="v0.10.0",
- until="v0.11.0",
- message="Use azimuth_label_font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
radius_max: float = config["frame_y_radius"],
@@ -2611,15 +2594,6 @@ class PolarPlane(Axes):
make_smooth_after_applying_functions: bool = True,
**kwargs,
):
- # deprecation
- azimuth_label_scale = kwargs.pop("azimuth_label_scale", None)
- if azimuth_label_scale:
- self.azimuth_label_font_size = (
- azimuth_label_scale * DEFAULT_FONT_SIZE * 0.75
- )
- else:
- self.azimuth_label_font_size = azimuth_label_font_size
-
# error catching
if azimuth_units in ["PI radians", "TAU radians", "degrees", "gradians", None]:
self.azimuth_units = azimuth_units
@@ -2675,7 +2649,7 @@ class PolarPlane(Axes):
self.make_smooth_after_applying_functions = make_smooth_after_applying_functions
self.azimuth_offset = azimuth_offset
self.azimuth_label_buff = azimuth_label_buff
- # self.azimuth_label_font_size = azimuth_label_font_size <-uncomment when deprecation is done
+ self.azimuth_label_font_size = azimuth_label_font_size
self.azimuth_compact_fraction = azimuth_compact_fraction
# init
diff --git a/manim/mobject/number_line.py b/manim/mobject/number_line.py
index c85f1f195..7e144ea1b 100644
--- a/manim/mobject/number_line.py
+++ b/manim/mobject/number_line.py
@@ -124,12 +124,6 @@ class NumberLine(Line):
values as the tick locations are dependent on the step size.
"""
- @deprecated_params(
- params="number_scale_value",
- since="v0.10.0",
- until="v0.11.0",
- message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
x_range: Optional[Sequence[float]] = None, # must be first
@@ -159,13 +153,6 @@ class NumberLine(Line):
numbers_to_include: Optional[Iterable[float]] = None,
**kwargs,
):
- # deprecation
- number_scale_value = kwargs.pop("number_scale_value", None)
- if number_scale_value is not None:
- self.font_size = number_scale_value * DEFAULT_FONT_SIZE * 0.75
- else:
- self.font_size = font_size
-
# avoid mutable arguments in defaults
if numbers_to_exclude is None:
numbers_to_exclude = []
@@ -190,7 +177,6 @@ class NumberLine(Line):
# turn into into an np array to scale by just applying the function
self.x_range = np.array(x_range, dtype=float)
self.x_min, self.x_max, self.x_step = scaling.function(self.x_range)
-
self.length = length
self.unit_size = unit_size
# ticks
@@ -206,6 +192,7 @@ class NumberLine(Line):
self.tip_width = tip_width
self.tip_height = tip_height
# numbers
+ self.font_size = font_size
self.include_numbers = include_numbers
self.label_direction = label_direction
self.line_to_number_buff = line_to_number_buff
diff --git a/manim/mobject/svg/brace.py b/manim/mobject/svg/brace.py
index 46296aeef..e378fc9df 100644
--- a/manim/mobject/svg/brace.py
+++ b/manim/mobject/svg/brace.py
@@ -149,12 +149,6 @@ class Brace(SVGPathMobject):
class BraceLabel(VMobject, metaclass=ConvertToOpenGL):
- @deprecated_params(
- params="label_scale",
- since="v0.10.0",
- until="v0.11.0",
- message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
obj,
@@ -165,12 +159,6 @@ class BraceLabel(VMobject, metaclass=ConvertToOpenGL):
buff=0.2,
**kwargs
):
- label_scale = kwargs.pop("label_scale", None)
- if label_scale:
- self.font_size = label_scale * DEFAULT_FONT_SIZE
- else:
- self.font_size = font_size
-
self.label_constructor = label_constructor
super().__init__(**kwargs)
diff --git a/manim/mobject/svg/code_mobject.py b/manim/mobject/svg/code_mobject.py
index ec841478d..41d946737 100644
--- a/manim/mobject/svg/code_mobject.py
+++ b/manim/mobject/svg/code_mobject.py
@@ -149,12 +149,6 @@ class Code(VGroup):
styles_list = list(get_all_styles())
# For more information about pygments.styles visit https://pygments.org/docs/styles/
- @deprecated_params(
- params="scale_factor",
- since="v0.10.0",
- until="v0.11.0",
- message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
file_name=None,
@@ -182,18 +176,12 @@ class Code(VGroup):
stroke_width=stroke_width,
**kwargs,
)
- # deprecation handling
- scale_factor = kwargs.pop("scale_factor", None)
- if scale_factor:
- self.font_size = DEFAULT_FONT_SIZE / 2 * scale_factor
- else:
- self.font_size = font_size
-
self.background_stroke_color = background_stroke_color
self.background_stroke_width = background_stroke_width
self.tab_width = tab_width
self.line_spacing = line_spacing
self.font = font
+ self.font_size = font_size
self.margin = margin
self.indentation_chars = indentation_chars
self.background = background
diff --git a/manim/mobject/svg/tex_mobject.py b/manim/mobject/svg/tex_mobject.py
index 3fb2fb4e4..6b1e63a7d 100644
--- a/manim/mobject/svg/tex_mobject.py
+++ b/manim/mobject/svg/tex_mobject.py
@@ -510,12 +510,6 @@ class Title(Tex):
"""
- @deprecated_params(
- params="scale_factor",
- since="v0.10.0",
- until="v0.11.0",
- message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
*text_parts,
@@ -524,9 +518,6 @@ class Title(Tex):
underline_buff=MED_SMALL_BUFF,
**kwargs,
):
- scale_factor = kwargs.pop("scale_factor", None)
- if scale_factor:
- kwargs["font_size"] = DEFAULT_FONT_SIZE * scale_factor
self.include_underline = include_underline
self.match_underline_width_to_text = match_underline_width_to_text
diff --git a/manim/mobject/svg/text_mobject.py b/manim/mobject/svg/text_mobject.py
index d661383d7..a084ebadb 100644
--- a/manim/mobject/svg/text_mobject.py
+++ b/manim/mobject/svg/text_mobject.py
@@ -352,7 +352,7 @@ class Text(SVGMobject):
'Google',
t2c={'[:1]': '#3174f0', '[1:2]': '#e53125',
'[2:3]': '#fbb003', '[3:4]': '#3174f0',
- '[4:5]': '#269a43', '[5:]': '#e53125'}, size=1.2).scale(3)
+ '[4:5]': '#269a43', '[5:]': '#e53125'}, font_size=58).scale(3)
self.add(text1)
As :class:`Text` uses Pango to render text, rendering non-English
@@ -398,12 +398,6 @@ class Text(SVGMobject):
"""
- @deprecated_params(
- params="size",
- since="v0.10.0",
- until="v0.11.0",
- message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
text: str,
@@ -430,16 +424,11 @@ class Text(SVGMobject):
disable_ligatures: bool = False,
**kwargs,
):
- # deprecation
- size = kwargs.pop("size", None)
- if size is not None:
- self._font_size = size * DEFAULT_FONT_SIZE
- else:
- # needs to be a float or else size is inflated when font_size = 24 (unknown cause)
- self._font_size = float(font_size)
self.line_spacing = line_spacing
self.font = font
+ self._font_size = float(font_size)
+ # needs to be a float or else size is inflated when font_size = 24 (unknown cause)
self.slant = slant
self.weight = weight
self.gradient = gradient
@@ -1025,12 +1014,6 @@ class MarkupText(SVGMobject):
"""
- @deprecated_params(
- params="size",
- since="v0.10.0",
- until="v0.11.0",
- message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
- )
def __init__(
self,
text: str,
@@ -1054,15 +1037,9 @@ class MarkupText(SVGMobject):
):
self.text = text
self.color = color
- # deprecation
- size = kwargs.pop("size", None)
- if size is not None:
- self._font_size = size * DEFAULT_FONT_SIZE
- else:
- self._font_size = float(font_size)
-
self.line_spacing = line_spacing
self.font = font
+ self._font_size = float(font_size)
self.slant = slant
self.weight = weight
self.gradient = gradient
diff --git a/manim/mobject/vector_field.py b/manim/mobject/vector_field.py
index 57abbb0f6..b92be50c9 100644
--- a/manim/mobject/vector_field.py
+++ b/manim/mobject/vector_field.py
@@ -511,12 +511,6 @@ class ArrowVectorField(VectorField):
"""
- @deprecated_params(
- params="x_min, x_max, delta_x, y_min, y_max, delta_y",
- since="v0.10.0",
- until="v0.11.0",
- message="Please use x_range and y_range instead.",
- )
def __init__(
self,
func: Callable[[np.ndarray], np.ndarray],
@@ -537,12 +531,12 @@ class ArrowVectorField(VectorField):
**kwargs
):
self.x_range = x_range or [
- kwargs.pop("x_min", None) or floor(-config["frame_width"] / 2),
- kwargs.pop("x_max", None) or ceil(config["frame_width"] / 2),
+ floor(-config["frame_width"] / 2),
+ ceil(config["frame_width"] / 2),
]
self.y_range = y_range or [
- kwargs.pop("y_min", None) or floor(-config["frame_height"] / 2),
- kwargs.pop("y_max", None) or ceil(config["frame_height"] / 2),
+ floor(-config["frame_height"] / 2),
+ ceil(config["frame_height"] / 2),
]
self.ranges = [self.x_range, self.y_range]
@@ -557,13 +551,6 @@ class ArrowVectorField(VectorField):
self.ranges[i] += [0.5]
self.ranges[i][1] += self.ranges[i][2]
- if "delta_x" in kwargs:
- self.ranges[0][2] = kwargs.pop("delta_x")
- self.ranges[0][1] += self.ranges[0][2] - 0.5
- if "delta_y" in kwargs:
- self.ranges[1][2] = kwargs.pop("delta_y")
- self.ranges[1][1] += self.ranges[1][2] - 0.5
-
self.x_range, self.y_range, self.z_range = self.ranges
super().__init__(
@@ -696,12 +683,6 @@ class StreamLines(VectorField):
"""
- @deprecated_params(
- params="x_min, x_max, delta_x, y_min, y_max, delta_y",
- since="v0.10.0",
- until="v0.11.0",
- message="Please use x_range and y_range instead.",
- )
def __init__(
self,
func: Callable[[np.ndarray], np.ndarray],
@@ -728,12 +709,12 @@ class StreamLines(VectorField):
**kwargs
):
self.x_range = x_range or [
- kwargs.pop("x_min", None) or floor(-config["frame_width"] / 2),
- kwargs.pop("x_max", None) or ceil(config["frame_width"] / 2),
+ floor(-config["frame_width"] / 2),
+ ceil(config["frame_width"] / 2),
]
self.y_range = y_range or [
- kwargs.pop("y_min", None) or floor(-config["frame_height"] / 2),
- kwargs.pop("y_max", None) or ceil(config["frame_height"] / 2),
+ floor(-config["frame_height"] / 2),
+ ceil(config["frame_height"] / 2),
]
self.ranges = [self.x_range, self.y_range]
@@ -748,13 +729,6 @@ class StreamLines(VectorField):
self.ranges[i] += [0.5]
self.ranges[i][1] += self.ranges[i][2]
- if "delta_x" in kwargs:
- self.ranges[0][2] = kwargs.pop("delta_x")
- self.ranges[0][1] += self.ranges[0][2] - 0.5
- if "delta_y" in kwargs:
- self.ranges[1][2] = kwargs.pop("delta_y")
- self.ranges[1][1] += self.ranges[1][2] - 0.5
-
self.x_range, self.y_range, self.z_range = self.ranges
super().__init__(