Adjust typings

This commit is contained in:
YishiMichael
2022-04-16 14:09:59 +08:00
parent bc18894040
commit 654da85cf6
4 changed files with 10 additions and 14 deletions

View File

@ -168,13 +168,17 @@ class TransformMatchingStrings(AnimationGroup):
assert isinstance(source, LabelledString)
assert isinstance(target, LabelledString)
anims = []
source_indices = list(range(len(source.labelled_submobjects)))
target_indices = list(range(len(target.labelled_submobjects)))
source_indices = list(range(len(source.labelled_submobject_items)))
target_indices = list(range(len(target.labelled_submobject_items)))
def get_indices_lists(mobject, parts):
labelled_submobjects = [
submob
for _, submob in mobject.labelled_submobject_items
]
return [
[
mobject.labelled_submobjects.index(submob)
labelled_submobjects.index(submob)
for submob in part
]
for part in parts

View File

@ -18,8 +18,6 @@ if TYPE_CHECKING:
from colour import Color
from typing import Iterable, Union
from manimlib.mobject.types.vectorized_mobject import VMobject
ManimColor = Union[str, Color]
Span = tuple[int, int]
SingleSelector = Union[
@ -125,7 +123,6 @@ class LabelledString(SVGMobject, ABC):
(submob.label, submob)
for submob in self.submobjects
]
self.labelled_submobjects = self.get_labelled_submobjects()
self.specified_substrs = self.get_specified_substrs()
self.group_items = self.get_group_items()
self.group_substrs = self.get_group_substrs()
@ -412,9 +409,6 @@ class LabelledString(SVGMobject, ABC):
# Post-parsing
def get_labelled_submobjects(self) -> list[VMobject]:
return [submob for _, submob in self.labelled_submobject_items]
def get_cleaned_substr(self, span: Span) -> str:
span_repl_dict = dict.fromkeys(self.command_spans, "")
return self.get_replaced_substr(span, span_repl_dict)
@ -545,7 +539,7 @@ class LabelledString(SVGMobject, ABC):
def select_part(
self, selector: Selector, index: int = 0, **kwargs
) -> VMobject:
) -> VGroup:
return self.select_parts(selector, **kwargs)[index]
def set_parts_color(

View File

@ -15,7 +15,6 @@ if TYPE_CHECKING:
from typing import Union
from manimlib.mobject.types.vectorized_mobject import VGroup
from manimlib.mobject.types.vectorized_mobject import VMobject
ManimColor = Union[str, Color]
Span = tuple[int, int]
@ -320,7 +319,7 @@ class MTex(LabelledString):
def get_parts_by_tex(self, selector: Selector, **kwargs) -> VGroup:
return self.select_parts(selector, **kwargs)
def get_part_by_tex(self, selector: Selector, **kwargs) -> VMobject:
def get_part_by_tex(self, selector: Selector, **kwargs) -> VGroup:
return self.select_part(selector, **kwargs)
def set_color_by_tex(

View File

@ -29,7 +29,6 @@ if TYPE_CHECKING:
from colour import Color
from typing import Union
from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.mobject.types.vectorized_mobject import VGroup
ManimColor = Union[str, Color]
@ -498,7 +497,7 @@ class MarkupText(LabelledString):
def get_parts_by_text(self, selector: Selector, **kwargs) -> VGroup:
return self.select_parts(selector, **kwargs)
def get_part_by_text(self, selector: Selector, **kwargs) -> VMobject:
def get_part_by_text(self, selector: Selector, **kwargs) -> VGroup:
return self.select_part(selector, **kwargs)
def set_color_by_text(