resolved merge conflicts (#85)

This commit is contained in:
Ben Hambrecht 2018-01-23 21:09:53 +01:00
parent 2cbf016dff
commit 963956cca7

View file

@ -11,7 +11,7 @@ class DecimalNumber(VMobject):
"num_decimal_points" : 2,
"digit_to_digit_buff" : 0.05,
"show_ellipsis" : False,
"unit" : None
"unit" : None,
}
def __init__(self, number, **kwargs):
digest_config(self, kwargs, locals())
@ -27,6 +27,8 @@ class DecimalNumber(VMobject):
if self.show_ellipsis:
self.add(TexMobject("\\dots"))
if self.unit is not None:
self.add(TexMobject(self.unit))
self.arrange_submobjects(
buff = self.digit_to_digit_buff,
@ -40,7 +42,6 @@ class DecimalNumber(VMobject):
buff = self.digit_to_digit_buff
)
if self.unit != None:
unit_sign = TexMobject(self.unit)
unit_sign.next_to(self.submobjects[-1],RIGHT,