mirror of
https://github.com/3b1b/manim.git
synced 2025-08-05 16:49:03 +00:00
Update numbers.py
Added config passing for text
This commit is contained in:
parent
7f9b0a7eac
commit
97c0f4857b
1 changed files with 13 additions and 7 deletions
|
@ -20,6 +20,7 @@ class DecimalNumber(VMobject):
|
||||||
"include_background_rectangle": False,
|
"include_background_rectangle": False,
|
||||||
"edge_to_fix": LEFT,
|
"edge_to_fix": LEFT,
|
||||||
"font_size": 48,
|
"font_size": 48,
|
||||||
|
"text_config": {} # Do not pass in font_size here
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self, number=0, **kwargs):
|
def __init__(self, number=0, **kwargs):
|
||||||
|
@ -30,13 +31,13 @@ class DecimalNumber(VMobject):
|
||||||
def set_submobjects_from_number(self, number):
|
def set_submobjects_from_number(self, number):
|
||||||
self.number = number
|
self.number = number
|
||||||
self.set_submobjects([])
|
self.set_submobjects([])
|
||||||
|
string_to_mob_ = lambda s: self.string_to_mob(s, **self.text_config)
|
||||||
num_string = self.get_num_string(number)
|
num_string = self.get_num_string(number)
|
||||||
self.add(*map(self.string_to_mob, num_string))
|
self.add(*map(string_to_mob_, num_string))
|
||||||
|
|
||||||
# Add non-numerical bits
|
# Add non-numerical bits
|
||||||
if self.show_ellipsis:
|
if self.show_ellipsis:
|
||||||
dots = self.string_to_mob("...")
|
dots = string_to_mob_("...")
|
||||||
dots.arrange(RIGHT, buff=2 * dots[0].get_width())
|
dots.arrange(RIGHT, buff=2 * dots[0].get_width())
|
||||||
self.add(dots)
|
self.add(dots)
|
||||||
if self.unit is not None:
|
if self.unit is not None:
|
||||||
|
@ -85,10 +86,15 @@ class DecimalNumber(VMobject):
|
||||||
def get_font_size(self):
|
def get_font_size(self):
|
||||||
return self.data["font_size"][0]
|
return self.data["font_size"][0]
|
||||||
|
|
||||||
def string_to_mob(self, string, mob_class=Text):
|
def string_to_mob(self, string, mob_class=Text, **kwargs):
|
||||||
if string not in string_to_mob_map:
|
if not kwargs:
|
||||||
string_to_mob_map[string] = mob_class(string, font_size=1)
|
if string not in string_to_mob_map:
|
||||||
mob = string_to_mob_map[string].copy()
|
string_to_mob_map[string] = mob_class(string, font_size=1, **kwargs)
|
||||||
|
mob = string_to_mob_map[string].copy()
|
||||||
|
else:
|
||||||
|
if (string, str(kwargs)) not in string_to_mob_map:
|
||||||
|
string_to_mob_map[(string, str(kwargs))] = mob_class(string, font_size=1, **kwargs)
|
||||||
|
mob = string_to_mob_map[(string, str(kwargs))].copy()
|
||||||
mob.scale(self.get_font_size())
|
mob.scale(self.get_font_size())
|
||||||
return mob
|
return mob
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue