Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Updated dearpygui version (#1861)

Ryan McCauleya3694b00268e
diff --git a/manim/gui/gui.py b/manim/gui/gui.py
index e3abae557..fa0452a31 100644
--- a/manim/gui/gui.py
+++ b/manim/gui/gui.py
@@ -1,24 +1,31 @@
from pathlib import Path
try:
- import dearpygui.core
- import dearpygui.demo
- import dearpygui.simple
+ import dearpygui.dearpygui as dpg
+ from dearpygui.demo import show_demo
dearpygui_imported = True
except ImportError:
dearpygui_imported = False
-from .. import config
+from .. import __version__, config
from ..utils.module_ops import scene_classes_from_file
+if dearpygui_imported:
+ window = dpg.generate_uuid()
+
def configure_pygui(renderer, widgets, update=True):
if not dearpygui_imported:
raise RuntimeError("Attempted to use DearPyGUI when it isn't imported.")
if update:
- dearpygui.core.delete_item("Manim GUI")
+ dpg.delete_item(window)
+ else:
+ dpg.setup_viewport()
+ dpg.set_viewport_title(title=f"Manim Community v{__version__}")
+ dpg.set_viewport_width(1015)
+ dpg.set_viewport_height(540)
def rerun_callback(sender, data):
renderer.scene.queue.put(("rerun_gui", [], {}))
@@ -27,33 +34,32 @@ def configure_pygui(renderer, widgets, update=True):
renderer.scene.queue.put(("exit_gui", [], {}))
def scene_selection_callback(sender, data):
- config["scene_names"] = (dearpygui.core.get_value(sender),)
+ config["scene_names"] = (dpg.get_value(sender),)
renderer.scene.queue.put(("rerun_gui", [], {}))
scene_classes = scene_classes_from_file(Path(config["input_file"]), full_list=True)
scene_names = [scene_class.__name__ for scene_class in scene_classes]
- with dearpygui.simple.window(
- "Manim GUI",
- x_pos=config["gui_location"][0],
- y_pos=config["gui_location"][1],
+ with dpg.window(
+ id=window,
+ label="Manim GUI",
+ pos=[config["gui_location"][0], config["gui_location"][1]],
width=1000,
height=500,
):
- dearpygui.core.set_main_window_size(width=1015, height=540)
- dearpygui.core.set_global_font_scale(2)
- dearpygui.core.add_button("Rerun", callback=rerun_callback)
- dearpygui.core.add_button("Continue", callback=continue_callback)
- dearpygui.core.add_combo(
- "Selected scene",
+ dpg.set_global_font_scale(2)
+ dpg.add_button(label="Rerun", callback=rerun_callback)
+ dpg.add_button(label="Continue", callback=continue_callback)
+ dpg.add_combo(
+ label="Selected scene",
items=scene_names,
callback=scene_selection_callback,
default_value=config["scene_names"][0],
)
- dearpygui.core.add_separator()
+ dpg.add_separator()
if len(widgets) != 0:
- with dearpygui.simple.collapsing_header(
- f"{config['scene_names'][0]} widgets", default_open=True
+ with dpg.collapsing_header(
+ label=f"{config['scene_names'][0]} widgets", default_open=True
):
for widget_config in widgets:
widget_config_copy = widget_config.copy()
@@ -62,11 +68,10 @@ def configure_pygui(renderer, widgets, update=True):
if widget != "separator":
del widget_config_copy["name"]
del widget_config_copy["widget"]
- getattr(dearpygui.core, f"add_{widget}")(
- name, **widget_config_copy
- )
+ getattr(dpg, f"add_{widget}")(name, **widget_config_copy)
else:
- dearpygui.core.add_separator()
- # dearpygui.demo.show_demo()
+ dpg.add_separator()
+ # show_demo()
+
if not update:
- dearpygui.core.start_dearpygui()
+ dpg.start_dearpygui()
diff --git a/manim/opengl/__init__.py b/manim/opengl/__init__.py
index cd1ea9d11..7150328c6 100644
--- a/manim/opengl/__init__.py
+++ b/manim/opengl/__init__.py
@@ -1,5 +1,5 @@
try:
- from dearpygui import core as dpg
+ from dearpygui import dearpygui as dpg
except ImportError:
pass
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index 0dc87c8fc..f3274f87f 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -16,7 +16,7 @@ import types
from queue import Queue
try:
- import dearpygui.core
+ import dearpygui.dearpygui as dpg
dearpygui_imported = True
except ImportError:
@@ -1045,7 +1045,7 @@ class Scene:
keyboard_thread.start()
if self.dearpygui_imported and config["enable_gui"]:
- if not dearpygui.core.is_dearpygui_running():
+ if not dpg.is_dearpygui_running():
gui_thread = threading.Thread(
target=configure_pygui,
args=(self.renderer, self.widgets),
@@ -1131,7 +1131,7 @@ class Scene:
file_observer.join()
if self.dearpygui_imported and config["enable_gui"]:
- dearpygui.core.stop_dearpygui()
+ dpg.stop_dearpygui()
if self.renderer.window.is_closing:
self.renderer.window.destroy()