Skip to content

Commit e24b71e

Browse files
kolibril13icedcoffeeeehydrobeampre-commit-ci[bot]
authored
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)
* depreciate until 0.11 * fix in text * Update manim/mobject/number_line.py * Update manim/mobject/svg/brace.py * Update manim/mobject/coordinate_systems.py * Update manim/mobject/svg/code_mobject.py * Update manim/mobject/svg/code_mobject.py * Update manim/mobject/vector_field.py Co-authored-by: icedcoffeeee <[email protected]> * Apply suggestions from code review Co-authored-by: icedcoffeeee <[email protected]> * Apply suggestions from code review Co-authored-by: Laith Bahodi <[email protected]> * azimuth_label_font_size new place * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * font_size right place * added font size * number_scale_value in example fix * adjust font size properly * adjust move things around * fix the docs Co-authored-by: icedcoffeeee <[email protected]> Co-authored-by: Laith Bahodi <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: hydrobeam <[email protected]>
1 parent 53bd6eb commit e24b71e

File tree

7 files changed

+16
-137
lines changed

7 files changed

+16
-137
lines changed

manim/mobject/coordinate_systems.py

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -223,17 +223,6 @@ def get_axes(self):
223223
def get_axis(self, index):
224224
return self.get_axes()[index]
225225

226-
@deprecated(since="v0.10.0", until="v0.11.0", message="Use get_origin instead.")
227-
def get_center_point(self) -> np.ndarray:
228-
"""Gets the origin of :class:`~.Axes`.
229-
230-
Returns
231-
-------
232-
np.ndarray
233-
The center point.
234-
"""
235-
return self.coords_to_point(0, 0)
236-
237226
def get_origin(self) -> np.ndarray:
238227
"""Gets the origin of :class:`~.Axes`.
239228
@@ -1589,7 +1578,7 @@ def construct(self):
15891578
ax = Axes(
15901579
x_range=[0, 8.0, 1],
15911580
y_range=[-1, 1, 0.2],
1592-
axis_config={"number_scale_value": 0.5},
1581+
axis_config={"font_size": 24},
15931582
).add_coordinates()
15941583
15951584
curve = ax.plot(lambda x: np.sin(x) / np.e ** 2 * x)
@@ -2586,12 +2575,6 @@ def construct(self):
25862575
self.add(polarplane_pi)
25872576
"""
25882577

2589-
@deprecated_params(
2590-
params="azimuth_label_scale",
2591-
since="v0.10.0",
2592-
until="v0.11.0",
2593-
message="Use azimuth_label_font_size instead. To convert old scale factors to font size, multiply by 48.",
2594-
)
25952578
def __init__(
25962579
self,
25972580
radius_max: float = config["frame_y_radius"],
@@ -2611,15 +2594,6 @@ def __init__(
26112594
make_smooth_after_applying_functions: bool = True,
26122595
**kwargs,
26132596
):
2614-
# deprecation
2615-
azimuth_label_scale = kwargs.pop("azimuth_label_scale", None)
2616-
if azimuth_label_scale:
2617-
self.azimuth_label_font_size = (
2618-
azimuth_label_scale * DEFAULT_FONT_SIZE * 0.75
2619-
)
2620-
else:
2621-
self.azimuth_label_font_size = azimuth_label_font_size
2622-
26232597
# error catching
26242598
if azimuth_units in ["PI radians", "TAU radians", "degrees", "gradians", None]:
26252599
self.azimuth_units = azimuth_units
@@ -2675,7 +2649,7 @@ def __init__(
26752649
self.make_smooth_after_applying_functions = make_smooth_after_applying_functions
26762650
self.azimuth_offset = azimuth_offset
26772651
self.azimuth_label_buff = azimuth_label_buff
2678-
# self.azimuth_label_font_size = azimuth_label_font_size <-uncomment when deprecation is done
2652+
self.azimuth_label_font_size = azimuth_label_font_size
26792653
self.azimuth_compact_fraction = azimuth_compact_fraction
26802654

26812655
# init

manim/mobject/number_line.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,6 @@ def construct(self):
124124
values as the tick locations are dependent on the step size.
125125
"""
126126

127-
@deprecated_params(
128-
params="number_scale_value",
129-
since="v0.10.0",
130-
until="v0.11.0",
131-
message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
132-
)
133127
def __init__(
134128
self,
135129
x_range: Optional[Sequence[float]] = None, # must be first
@@ -159,13 +153,6 @@ def __init__(
159153
numbers_to_include: Optional[Iterable[float]] = None,
160154
**kwargs,
161155
):
162-
# deprecation
163-
number_scale_value = kwargs.pop("number_scale_value", None)
164-
if number_scale_value is not None:
165-
self.font_size = number_scale_value * DEFAULT_FONT_SIZE * 0.75
166-
else:
167-
self.font_size = font_size
168-
169156
# avoid mutable arguments in defaults
170157
if numbers_to_exclude is None:
171158
numbers_to_exclude = []
@@ -190,7 +177,6 @@ def __init__(
190177
# turn into into an np array to scale by just applying the function
191178
self.x_range = np.array(x_range, dtype=float)
192179
self.x_min, self.x_max, self.x_step = scaling.function(self.x_range)
193-
194180
self.length = length
195181
self.unit_size = unit_size
196182
# ticks
@@ -206,6 +192,7 @@ def __init__(
206192
self.tip_width = tip_width
207193
self.tip_height = tip_height
208194
# numbers
195+
self.font_size = font_size
209196
self.include_numbers = include_numbers
210197
self.label_direction = label_direction
211198
self.line_to_number_buff = line_to_number_buff

manim/mobject/svg/brace.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,6 @@ def get_direction(self):
149149

150150

151151
class BraceLabel(VMobject, metaclass=ConvertToOpenGL):
152-
@deprecated_params(
153-
params="label_scale",
154-
since="v0.10.0",
155-
until="v0.11.0",
156-
message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
157-
)
158152
def __init__(
159153
self,
160154
obj,
@@ -165,12 +159,6 @@ def __init__(
165159
buff=0.2,
166160
**kwargs
167161
):
168-
label_scale = kwargs.pop("label_scale", None)
169-
if label_scale:
170-
self.font_size = label_scale * DEFAULT_FONT_SIZE
171-
else:
172-
self.font_size = font_size
173-
174162
self.label_constructor = label_constructor
175163
super().__init__(**kwargs)
176164

manim/mobject/svg/code_mobject.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,6 @@ def construct(self):
149149
styles_list = list(get_all_styles())
150150
# For more information about pygments.styles visit https://pygments.org/docs/styles/
151151

152-
@deprecated_params(
153-
params="scale_factor",
154-
since="v0.10.0",
155-
until="v0.11.0",
156-
message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
157-
)
158152
def __init__(
159153
self,
160154
file_name=None,
@@ -182,18 +176,12 @@ def __init__(
182176
stroke_width=stroke_width,
183177
**kwargs,
184178
)
185-
# deprecation handling
186-
scale_factor = kwargs.pop("scale_factor", None)
187-
if scale_factor:
188-
self.font_size = DEFAULT_FONT_SIZE / 2 * scale_factor
189-
else:
190-
self.font_size = font_size
191-
192179
self.background_stroke_color = background_stroke_color
193180
self.background_stroke_width = background_stroke_width
194181
self.tab_width = tab_width
195182
self.line_spacing = line_spacing
196183
self.font = font
184+
self.font_size = font_size
197185
self.margin = margin
198186
self.indentation_chars = indentation_chars
199187
self.background = background

manim/mobject/svg/tex_mobject.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,6 @@ def construct(self):
510510
511511
"""
512512

513-
@deprecated_params(
514-
params="scale_factor",
515-
since="v0.10.0",
516-
until="v0.11.0",
517-
message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
518-
)
519513
def __init__(
520514
self,
521515
*text_parts,
@@ -524,9 +518,6 @@ def __init__(
524518
underline_buff=MED_SMALL_BUFF,
525519
**kwargs,
526520
):
527-
scale_factor = kwargs.pop("scale_factor", None)
528-
if scale_factor:
529-
kwargs["font_size"] = DEFAULT_FONT_SIZE * scale_factor
530521

531522
self.include_underline = include_underline
532523
self.match_underline_width_to_text = match_underline_width_to_text

manim/mobject/svg/text_mobject.py

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def construct(self):
352352
'Google',
353353
t2c={'[:1]': '#3174f0', '[1:2]': '#e53125',
354354
'[2:3]': '#fbb003', '[3:4]': '#3174f0',
355-
'[4:5]': '#269a43', '[5:]': '#e53125'}, size=1.2).scale(3)
355+
'[4:5]': '#269a43', '[5:]': '#e53125'}, font_size=58).scale(3)
356356
self.add(text1)
357357
358358
As :class:`Text` uses Pango to render text, rendering non-English
@@ -398,12 +398,6 @@ def construct(self):
398398
399399
"""
400400

401-
@deprecated_params(
402-
params="size",
403-
since="v0.10.0",
404-
until="v0.11.0",
405-
message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
406-
)
407401
def __init__(
408402
self,
409403
text: str,
@@ -430,16 +424,11 @@ def __init__(
430424
disable_ligatures: bool = False,
431425
**kwargs,
432426
):
433-
# deprecation
434-
size = kwargs.pop("size", None)
435-
if size is not None:
436-
self._font_size = size * DEFAULT_FONT_SIZE
437-
else:
438-
# needs to be a float or else size is inflated when font_size = 24 (unknown cause)
439-
self._font_size = float(font_size)
440427

441428
self.line_spacing = line_spacing
442429
self.font = font
430+
self._font_size = float(font_size)
431+
# needs to be a float or else size is inflated when font_size = 24 (unknown cause)
443432
self.slant = slant
444433
self.weight = weight
445434
self.gradient = gradient
@@ -1025,12 +1014,6 @@ def construct(self):
10251014
10261015
"""
10271016

1028-
@deprecated_params(
1029-
params="size",
1030-
since="v0.10.0",
1031-
until="v0.11.0",
1032-
message="Use font_size instead. To convert old scale factors to font size, multiply by 48.",
1033-
)
10341017
def __init__(
10351018
self,
10361019
text: str,
@@ -1054,15 +1037,9 @@ def __init__(
10541037
):
10551038
self.text = text
10561039
self.color = color
1057-
# deprecation
1058-
size = kwargs.pop("size", None)
1059-
if size is not None:
1060-
self._font_size = size * DEFAULT_FONT_SIZE
1061-
else:
1062-
self._font_size = float(font_size)
1063-
10641040
self.line_spacing = line_spacing
10651041
self.font = font
1042+
self._font_size = float(font_size)
10661043
self.slant = slant
10671044
self.weight = weight
10681045
self.gradient = gradient

manim/mobject/vector_field.py

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,6 @@ def construct(self):
511511
512512
"""
513513

514-
@deprecated_params(
515-
params="x_min, x_max, delta_x, y_min, y_max, delta_y",
516-
since="v0.10.0",
517-
until="v0.11.0",
518-
message="Please use x_range and y_range instead.",
519-
)
520514
def __init__(
521515
self,
522516
func: Callable[[np.ndarray], np.ndarray],
@@ -537,12 +531,12 @@ def __init__(
537531
**kwargs
538532
):
539533
self.x_range = x_range or [
540-
kwargs.pop("x_min", None) or floor(-config["frame_width"] / 2),
541-
kwargs.pop("x_max", None) or ceil(config["frame_width"] / 2),
534+
floor(-config["frame_width"] / 2),
535+
ceil(config["frame_width"] / 2),
542536
]
543537
self.y_range = y_range or [
544-
kwargs.pop("y_min", None) or floor(-config["frame_height"] / 2),
545-
kwargs.pop("y_max", None) or ceil(config["frame_height"] / 2),
538+
floor(-config["frame_height"] / 2),
539+
ceil(config["frame_height"] / 2),
546540
]
547541
self.ranges = [self.x_range, self.y_range]
548542

@@ -557,13 +551,6 @@ def __init__(
557551
self.ranges[i] += [0.5]
558552
self.ranges[i][1] += self.ranges[i][2]
559553

560-
if "delta_x" in kwargs:
561-
self.ranges[0][2] = kwargs.pop("delta_x")
562-
self.ranges[0][1] += self.ranges[0][2] - 0.5
563-
if "delta_y" in kwargs:
564-
self.ranges[1][2] = kwargs.pop("delta_y")
565-
self.ranges[1][1] += self.ranges[1][2] - 0.5
566-
567554
self.x_range, self.y_range, self.z_range = self.ranges
568555

569556
super().__init__(
@@ -696,12 +683,6 @@ def construct(self):
696683
697684
"""
698685

699-
@deprecated_params(
700-
params="x_min, x_max, delta_x, y_min, y_max, delta_y",
701-
since="v0.10.0",
702-
until="v0.11.0",
703-
message="Please use x_range and y_range instead.",
704-
)
705686
def __init__(
706687
self,
707688
func: Callable[[np.ndarray], np.ndarray],
@@ -728,12 +709,12 @@ def __init__(
728709
**kwargs
729710
):
730711
self.x_range = x_range or [
731-
kwargs.pop("x_min", None) or floor(-config["frame_width"] / 2),
732-
kwargs.pop("x_max", None) or ceil(config["frame_width"] / 2),
712+
floor(-config["frame_width"] / 2),
713+
ceil(config["frame_width"] / 2),
733714
]
734715
self.y_range = y_range or [
735-
kwargs.pop("y_min", None) or floor(-config["frame_height"] / 2),
736-
kwargs.pop("y_max", None) or ceil(config["frame_height"] / 2),
716+
floor(-config["frame_height"] / 2),
717+
ceil(config["frame_height"] / 2),
737718
]
738719
self.ranges = [self.x_range, self.y_range]
739720

@@ -748,13 +729,6 @@ def __init__(
748729
self.ranges[i] += [0.5]
749730
self.ranges[i][1] += self.ranges[i][2]
750731

751-
if "delta_x" in kwargs:
752-
self.ranges[0][2] = kwargs.pop("delta_x")
753-
self.ranges[0][1] += self.ranges[0][2] - 0.5
754-
if "delta_y" in kwargs:
755-
self.ranges[1][2] = kwargs.pop("delta_y")
756-
self.ranges[1][1] += self.ranges[1][2] - 0.5
757-
758732
self.x_range, self.y_range, self.z_range = self.ranges
759733

760734
super().__init__(

0 commit comments

Comments
 (0)