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

Some refactors

Browse source
This commit is contained in:
Michael W 2021-12-05 10:21:55 +08:00 • committed by GitHub
parent 62151e52f1
commit 950466c1da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
manimlib/mobject/svg/mtex_mobject.py
View file

@ -26,19 +26,24 @@ class _LabelledTex(SVGMobject):
}, },
} }
@staticmethod
def color_str_to_label(color):
return int(color[1:], 16) - 1
def get_mobjects_from(self, element): def get_mobjects_from(self, element):
result = super().get_mobjects_from(element) result = super().get_mobjects_from(element)
for mob in result: for mob in result:
if not hasattr(mob, "label_str"): if not hasattr(mob, "glyph_label"):
mob.label_str = "" mob.glyph_label = -1
try: try:
label_str = element.getAttribute("fill") color_str = element.getAttribute("fill")
if label_str: if color_str:
if len(label_str) == 4: if len(color_str) == 4:
# "#RGB" => "#RRGGBB" # "#RGB" => "#RRGGBB"
label_str = "#" + "".join([c * 2 for c in label_str[1:]]) color_str = "#" + "".join([c * 2 for c in color_str[1:]])
glyph_label = _LabelledTex.color_str_to_label(color_str)
for mob in result: for mob in result:
mob.label_str = label_str mob.glyph_label = glyph_label
except: except:
pass pass
return result return result
@ -100,6 +105,19 @@ class MTex(VMobject):
if self.organize_left_to_right: if self.organize_left_to_right:
self.organize_submobjects_left_to_right() self.organize_submobjects_left_to_right()
@staticmethod
def label_to_color_tuple(n):
# Get a unique color different from black,
# or the svg file will not include the color information.
rgb = n + 1
rg, b = divmod(rgb, 256)
r, g = divmod(rg, 256)
return r, g, b
@staticmethod
def get_neighbouring_pairs(iterable):
return list(adjacent_pairs(iterable))[:-1]
def add_tex_span(self, span_tuple, script_type=0): def add_tex_span(self, span_tuple, script_type=0):
if script_type == 0: if script_type == 0:
# Should be additionally labelled. # Should be additionally labelled.
@ -231,7 +249,7 @@ class MTex(VMobject):
indices_with_labels.append((len(tex_string), 0, 0, -1)) indices_with_labels.append((len(tex_string), 0, 0, -1))
result = tex_string[: indices_with_labels[0][0]] result = tex_string[: indices_with_labels[0][0]]
index_with_label_pairs = list(adjacent_pairs(indices_with_labels))[:-1] index_with_label_pairs = MTex.get_neighbouring_pairs(indices_with_labels)
for index_with_label, next_index_with_label in index_with_label_pairs: for index_with_label, next_index_with_label in index_with_label_pairs:
index, flag, _, label = index_with_label index, flag, _, label = index_with_label
# Adding one more pair of braces will help maintain the glyghs of tex file... # Adding one more pair of braces will help maintain the glyghs of tex file...
@ -249,34 +267,25 @@ class MTex(VMobject):
result += tex_string[index : next_index_with_label[0]] result += tex_string[index : next_index_with_label[0]]
return result return result
@staticmethod
def label_to_color_tuple(n):
# Get a unique color different from black,
# or the svg file will not include the color information.
rgb = n + 1
rg, b = divmod(rgb, 256)
r, g = divmod(rg, 256)
return r, g, b
@staticmethod
def color_str_to_label(color):
return int(color[1:], 16) - 1
def build_submobjects(self): def build_submobjects(self):
# Simply pack together adjacent mobjects with the same label. # Simply pack together adjacent mobjects with the same label.
new_submobjects = [] new_submobjects = []
new_glyphs = [] new_glyphs = []
current_label_str = "" current_glyph_label = -1
for submob in self.submobjects: for submob in self.submobjects:
if submob.label_str == current_label_str: if submob.glyph_label == current_glyph_label:
new_glyphs.append(submob) new_glyphs.append(submob)
else: else:
if new_glyphs: if new_glyphs:
new_submobjects.append(VGroup(*new_glyphs)) new_submobject = VGroup(*new_glyphs)
new_submobject.submob_label = current_glyph_label
new_submobjects.append(new_submobject)
new_glyphs = [submob] new_glyphs = [submob]
current_label_str = submob.label_str current_glyph_label = submob.glyph_label
if new_glyphs: if new_glyphs:
new_submobjects.append(VGroup(*new_glyphs)) new_submobject = VGroup(*new_glyphs)
new_submobject.submob_label = current_glyph_label
new_submobjects.append(new_submobject)
self.set_submobjects(new_submobjects) self.set_submobjects(new_submobjects)
return self return self
@ -289,7 +298,7 @@ class MTex(VMobject):
if tex_span.script_type != 0 if tex_span.script_type != 0
for index in span_tuple for index in span_tuple
]) ])
script_span_with_type_pair = list(adjacent_pairs(script_spans_with_types))[:-1] script_span_with_type_pair = MTex.get_neighbouring_pairs(script_spans_with_types)
for span_with_type_0, span_with_type_1 in script_span_with_type_pair: for span_with_type_0, span_with_type_1 in script_span_with_type_pair:
index_0, span_tuple_0, script_type_0 = span_with_type_0 index_0, span_tuple_0, script_type_0 = span_with_type_0
index_1, span_tuple_1, script_type_1 = span_with_type_1 index_1, span_tuple_1, script_type_1 = span_with_type_1
@ -319,9 +328,8 @@ class MTex(VMobject):
for span_tuple in span_tuples for span_tuple in span_tuples
]))) ])))
return VGroup(*filter( return VGroup(*filter(
lambda submob: submob.label_str \ lambda submob: submob.submob_label in labels,
and MTex.color_str_to_label(submob.label_str) in labels, self.submobjects
it.chain(*self.submobjects)
)) ))
def find_span_components_of_custom_span(self, custom_span_tuple, partial_result=[]): def find_span_components_of_custom_span(self, custom_span_tuple, partial_result=[]):
@ -367,33 +375,30 @@ class MTex(VMobject):
self.set_color_by_tex(tex, color) self.set_color_by_tex(tex, color)
return self return self
def index_of_glyph(self, glyph): def indices_of_part(self, part):
submobs = self.submobjects return [
submobs_len = len(submobs) i for i, submob in enumerate(self.submobjects)
result = 0 if submob in part
while result < submobs_len and glyph not in submobs[result]: ]
result += 1
if result == submobs_len: def indices_of_part_by_tex(self, tex, index=0):
raise ValueError("Unable to find glyph in tex") part = self.get_part_by_tex(tex, index=index)
return result return self.indices_of_part(part)
def slice_of_part(self, part): def slice_of_part(self, part):
# Only finds where the head and the tail of `part` are. indices = self.indices_of_part(part)
begin_index = self.index_of_glyph(part[0]) return slice(indices[0], indices[-1] + 1)
end_index = self.index_of_glyph(part[-1])
if begin_index > end_index:
raise ValueError("Unable to find part in tex")
return slice(begin_index, end_index + 1)
def slice_of_part_by_tex(self, tex, index=0): def slice_of_part_by_tex(self, tex, index=0):
part = self.get_part_by_tex(tex, index=index) part = self.get_part_by_tex(tex, index=index)
return self.slice_of_part(part) return self.slice_of_part(part)
def index_of_part(self, part): def index_of_part(self, part):
return self.slice_of_part(part).start return self.indices_of_part(part)[0]
def index_of_part_by_tex(self, tex, index=0): def index_of_part_by_tex(self, tex, index=0):
return self.slice_of_part_by_tex(tex, index=index).start part = self.get_part_by_tex(tex, index=index)
return self.index_of_part(part)
def get_all_isolated_substrings(self): def get_all_isolated_substrings(self):
tex_string = self.tex_string tex_string = self.tex_string