public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-05 16:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better height, width, unit_size behavior for CoordinateSystems

Browse source
This commit is contained in:
Grant Sanderson 2022-12-19 20:34:42 -08:00
parent d8deec8f81
commit c605ac1c83
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
manimlib/mobject/coordinate_systems.py
View file

@ -410,13 +410,15 @@ class Axes(VGroup, CoordinateSystem):
axis_config: dict = dict(), axis_config: dict = dict(),
x_axis_config: dict = dict(), x_axis_config: dict = dict(),
y_axis_config: dict = dict(), y_axis_config: dict = dict(),
height: float = FRAME_HEIGHT - 2, height: float | None = None,
width: float = FRAME_WIDTH - 2, width: float | None = None,
unit_size: float = 1.0,
**kwargs **kwargs
): ):
CoordinateSystem.__init__(self, x_range, y_range, **kwargs) CoordinateSystem.__init__(self, x_range, y_range, **kwargs)
VGroup.__init__(self, **kwargs) VGroup.__init__(self, **kwargs)
axis_config = dict(**axis_config, unit_size=unit_size)
self.x_axis = self.create_axis( self.x_axis = self.create_axis(
self.x_range, self.x_range,
axis_config=merge_dicts_recursively( axis_config=merge_dicts_recursively(
@ -435,7 +437,7 @@ class Axes(VGroup, CoordinateSystem):
axis_config, axis_config,
y_axis_config y_axis_config
), ),
length=height length=height,
) )
self.y_axis.rotate(90 * DEGREES, about_point=ORIGIN) self.y_axis.rotate(90 * DEGREES, about_point=ORIGIN)
# Add as a separate group in case various other # Add as a separate group in case various other
@ -449,7 +451,7 @@ class Axes(VGroup, CoordinateSystem):
self, self,
range_terms: RangeSpecifier, range_terms: RangeSpecifier,
axis_config: dict, axis_config: dict,
length: float length: float | None
) -> NumberLine: ) -> NumberLine:
axis = NumberLine(range_terms, width=length, **axis_config) axis = NumberLine(range_terms, width=length, **axis_config)
axis.shift(-axis.n2p(0)) axis.shift(-axis.n2p(0))
@ -576,8 +578,6 @@ class NumberPlane(Axes):
self, self,
x_range: RangeSpecifier = (-8.0, 8.0, 1.0), x_range: RangeSpecifier = (-8.0, 8.0, 1.0),
y_range: RangeSpecifier = (-4.0, 4.0, 1.0), y_range: RangeSpecifier = (-4.0, 4.0, 1.0),
height: float = 8.0,
width: float = 16.0,
background_line_style: dict = dict( background_line_style: dict = dict(
stroke_color=BLUE_D, stroke_color=BLUE_D,
stroke_width=2, stroke_width=2,
@ -589,12 +589,7 @@ class NumberPlane(Axes):
make_smooth_after_applying_functions: bool = True, make_smooth_after_applying_functions: bool = True,
**kwargs **kwargs
): ):
super().__init__( super().__init__(x_range, y_range, **kwargs)
x_range, y_range,
height=height,
width=width,
**kwargs
)
self.background_line_style = dict(background_line_style) self.background_line_style = dict(background_line_style)
self.faded_line_style = dict(faded_line_style) self.faded_line_style = dict(faded_line_style)
self.faded_line_ratio = faded_line_ratio self.faded_line_ratio = faded_line_ratio