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

Resolved conflicts in

Browse source
This commit is contained in:
Ben Hambrecht 2018-01-24 18:53:07 +01:00
commit 738d6974b7
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
topics/numerals.py
View file

@ -41,15 +41,7 @@ class DecimalNumber(VMobject):
if self.show_ellipsis: if self.show_ellipsis:
self.add(TexMobject("\\dots")) self.add(TexMobject("\\dots"))
if self.unit is not None:
self.add(TexMobject(self.unit))
self.arrange_submobjects(
buff = self.digit_to_digit_buff,
aligned_edge = DOWN
)
<<<<<<< HEAD
if num_string.startswith("-"): if num_string.startswith("-"):
minus = self.submobjects[0] minus = self.submobjects[0]
minus.next_to( minus.next_to(
@ -68,9 +60,13 @@ class DecimalNumber(VMobject):
unit_sign.align_to(self,DOWN) unit_sign.align_to(self,DOWN)
self.add(unit_sign) self.add(unit_sign)
self.arrange_submobjects(
buff = self.digit_to_digit_buff,
aligned_edge = DOWN
)
class Integer(VGroup): class Integer(VGroup):
=======
#Handle alignment of parts that should be aligned #Handle alignment of parts that should be aligned
#to the bottom #to the bottom
for i, c in enumerate(num_string): for i, c in enumerate(num_string):
@ -89,7 +85,6 @@ class Integer(VGroup):
] ]
class Integer(DecimalNumber): class Integer(DecimalNumber):
>>>>>>> master
CONFIG = { CONFIG = {
"num_decimal_points" : 0, "num_decimal_points" : 0,
} }