diff --git a/manimlib/extract_scene.py b/manimlib/extract_scene.py index d1467e44..7a537769 100644 --- a/manimlib/extract_scene.py +++ b/manimlib/extract_scene.py @@ -26,18 +26,20 @@ def is_child_scene(obj, module): def prompt_user_for_choice(scene_classes): name_to_class = {} - for scene_class in scene_classes: + max_digits = len(str(len(scene_classes))) + for idx, scene_class in enumerate(scene_classes, start=1): name = scene_class.__name__ - print(name) + print(f"{str(idx).zfill(max_digits)}: {name}") name_to_class[name] = scene_class try: user_input = input( - "\nThat module has multiple scenes, which " - "ones would you like to render?\n Scene Name: " + "\nThat module has multiple scenes, " + "which ones would you like to render?" + "\nScene Name or Number: " ) return [ - name_to_class[user_input] - for num_str in user_input.replace(" ", "").split(",") + name_to_class[split_str] if not split_str.isnumeric() else scene_classes[int(split_str)-1] + for split_str in user_input.replace(" ", "").split(",") ] except KeyError: logging.log(logging.ERROR, "Invalid scene") diff --git a/manimlib/mobject/number_line.py b/manimlib/mobject/number_line.py index 1d4c782e..bd475215 100644 --- a/manimlib/mobject/number_line.py +++ b/manimlib/mobject/number_line.py @@ -99,7 +99,7 @@ class NumberLine(Line): return result def get_tick_marks(self): - return self.tick_marks + return self.ticks def number_to_point(self, number): alpha = float(number - self.x_min) / (self.x_max - self.x_min) diff --git a/manimlib/scene/graph_scene.py b/manimlib/scene/graph_scene.py index 6bfc6d34..cc3faf78 100644 --- a/manimlib/scene/graph_scene.py +++ b/manimlib/scene/graph_scene.py @@ -82,7 +82,7 @@ class GraphScene(Scene): if len(self.x_labeled_nums) > 0: if self.exclude_zero_label: self.x_labeled_nums = [x for x in self.x_labeled_nums if x != 0] - x_axis.add_numbers(*self.x_labeled_nums) + x_axis.add_numbers(self.x_labeled_nums) if self.x_axis_label: x_label = TexText(self.x_axis_label) x_label.next_to( @@ -116,7 +116,7 @@ class GraphScene(Scene): if len(self.y_labeled_nums) > 0: if self.exclude_zero_label: self.y_labeled_nums = [y for y in self.y_labeled_nums if y != 0] - y_axis.add_numbers(*self.y_labeled_nums) + y_axis.add_numbers(self.y_labeled_nums) if self.y_axis_label: y_label = TexText(self.y_axis_label) y_label.next_to(