public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-04-13 09:47:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Factor out get_num_string

Browse source
This commit is contained in:
Grant Sanderson 2021-01-13 11:11:25 -10:00
parent 39cdae0983
commit 9f5f682351
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
manimlib/mobject/numbers.py
View file

@ -29,19 +29,7 @@ class DecimalNumber(VMobject):
self.number = number self.number = number
self.set_submobjects([]) self.set_submobjects([])
if isinstance(number, complex): num_string = self.get_num_string(number)
formatter = self.get_complex_formatter()
else:
formatter = self.get_formatter()
num_string = formatter.format(number)
rounded_num = np.round(number, self.num_decimal_places)
if num_string.startswith("-") and rounded_num == 0:
if self.include_sign:
num_string = "+" + num_string[1:]
else:
num_string = num_string[1:]
self.add(*map(self.string_to_mob, num_string)) self.add(*map(self.string_to_mob, num_string))
# Add non-numerical bits # Add non-numerical bits
@ -78,6 +66,21 @@ class DecimalNumber(VMobject):
if self.include_background_rectangle: if self.include_background_rectangle:
self.add_background_rectangle() self.add_background_rectangle()
def get_num_string(self, number):
if isinstance(number, complex):
formatter = self.get_complex_formatter()
else:
formatter = self.get_formatter()
num_string = formatter.format(number)
rounded_num = np.round(number, self.num_decimal_places)
if num_string.startswith("-") and rounded_num == 0:
if self.include_sign:
num_string = "+" + num_string[1:]
else:
num_string = num_string[1:]
return num_string
def init_data(self): def init_data(self):
super().init_data() super().init_data()
self.data["font_size"] = np.array([self.font_size], dtype=float) self.data["font_size"] = np.array([self.font_size], dtype=float)
@ -88,7 +91,7 @@ class DecimalNumber(VMobject):
def string_to_mob(self, tex_string): def string_to_mob(self, tex_string):
# Could just call SingleStringTexMobject, and there is # Could just call SingleStringTexMobject, and there is
# some code repetition here by looking to the same cache, # some code repetition here by looking to the same cache,
# but it means keeps things from initializing a new object # but it keeps things from initializing a new object
# more than is necessary # more than is necessary
if tex_string in tex_string_to_mob_map: if tex_string in tex_string_to_mob_map:
result = tex_string_to_mob_map[tex_string].copy() result = tex_string_to_mob_map[tex_string].copy()