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

Merge pull request #1744 from TurkeyBilly/patch-3

Browse source 
Add text_config for DecimalNumber
This commit is contained in:
Grant Sanderson 2022-02-15 09:59:46 -08:00 • committed by GitHub
commit a4eee6f44c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manimlib/mobject/numbers.py
View file

@ -2,6 +2,7 @@ from manimlib.constants import *
from manimlib.mobject.svg.tex_mobject import SingleStringTex from manimlib.mobject.svg.tex_mobject import SingleStringTex
from manimlib.mobject.svg.text_mobject import Text from manimlib.mobject.svg.text_mobject import Text
from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.utils.iterables import hash_obj
string_to_mob_map = {} string_to_mob_map = {}
@ -20,23 +21,23 @@ 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):
super().__init__(**kwargs) super().__init__(**kwargs)
self.set_submobjects_from_number(number) self.set_submobjects_from_number(number)
self.init_colors()
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,10 @@ 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 (string, hash_obj(kwargs)) not in string_to_mob_map:
string_to_mob_map[string] = mob_class(string, font_size=1) string_to_mob_map[(string, hash_obj(kwargs))] = mob_class(string, font_size=1, **kwargs)
mob = string_to_mob_map[string].copy() mob = string_to_mob_map[(string, hash_obj(kwargs))].copy()
mob.scale(self.get_font_size()) mob.scale(self.get_font_size())
return mob return mob