From 9878fc56368919200b33f0700e12afced4fb4e5d Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Thu, 16 Jan 2025 20:00:16 -0500 Subject: [PATCH 1/4] remove event filters attr --- fastplotlib/ui/_base.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/fastplotlib/ui/_base.py b/fastplotlib/ui/_base.py index 0abc81e88..6c134d415 100644 --- a/fastplotlib/ui/_base.py +++ b/fastplotlib/ui/_base.py @@ -248,8 +248,6 @@ def __init__(self, figure: Figure, *args, **kwargs): self._figure = figure self._fa_icons = self._figure._fa_icons - self._event_filter_names = set() - self.is_open = False def open(self, pos: tuple[int, int], *args, **kwargs): From f585c5c34ba1d166f2ffea6f662486e158d9ec22 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Thu, 16 Jan 2025 20:00:58 -0500 Subject: [PATCH 2/4] fix standard right click menu --- fastplotlib/ui/right_click_menus/_standard_menu.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fastplotlib/ui/right_click_menus/_standard_menu.py b/fastplotlib/ui/right_click_menus/_standard_menu.py index cb1763d6d..a098f4b10 100644 --- a/fastplotlib/ui/right_click_menus/_standard_menu.py +++ b/fastplotlib/ui/right_click_menus/_standard_menu.py @@ -82,14 +82,14 @@ def update(self): imgui.separator() # autoscale, center, maintain aspect - if imgui.menu_item(f"Autoscale", None, False)[0]: + if imgui.menu_item(f"Autoscale", "", False)[0]: self.get_subplot().auto_scale() - if imgui.menu_item(f"Center", None, False)[0]: + if imgui.menu_item(f"Center", "", False)[0]: self.get_subplot().center_scene() _, maintain_aspect = imgui.menu_item( - "Maintain Aspect", None, self.get_subplot().camera.maintain_aspect + "Maintain Aspect", "", self.get_subplot().camera.maintain_aspect ) self.get_subplot().camera.maintain_aspect = maintain_aspect @@ -98,7 +98,7 @@ def update(self): # toggles to flip axes cameras for axis in ["x", "y", "z"]: scale = getattr(self.get_subplot().camera.local, f"scale_{axis}") - changed, flip = imgui.menu_item(f"Flip {axis} axis", None, scale < 0) + changed, flip = imgui.menu_item(f"Flip {axis} axis", "", bool(scale < 0)) if changed: flip_axis(self.get_subplot(), axis, flip) @@ -109,7 +109,7 @@ def update(self): for plane in ["xy", "xz", "yz"]: grid = getattr(self.get_subplot().axes.grids, plane) visible = grid.visible - changed, new_visible = imgui.menu_item(f"Grid {plane}", None, visible) + changed, new_visible = imgui.menu_item(f"Grid {plane}", "", visible) if changed: grid.visible = new_visible @@ -140,7 +140,7 @@ def update(self): # controller options if imgui.begin_menu("Controller"): _, enabled = imgui.menu_item( - "Enabled", None, self.get_subplot().controller.enabled + "Enabled", "", self.get_subplot().controller.enabled ) self.get_subplot().controller.enabled = enabled @@ -163,7 +163,7 @@ def update(self): clicked, _ = imgui.menu_item( label=name, - shortcut=None, + shortcut="", p_selected=current_type is controller_type_iter, ) From 1d40b47b4e135f8842abf990306f0d85e8026485 Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Thu, 16 Jan 2025 20:11:23 -0500 Subject: [PATCH 3/4] fix colormap picker menu for imgui-bundle v1.6.0 --- fastplotlib/ui/right_click_menus/_colormap_picker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastplotlib/ui/right_click_menus/_colormap_picker.py b/fastplotlib/ui/right_click_menus/_colormap_picker.py index 03176f673..3c48bd4d8 100644 --- a/fastplotlib/ui/right_click_menus/_colormap_picker.py +++ b/fastplotlib/ui/right_click_menus/_colormap_picker.py @@ -153,7 +153,7 @@ def update(self): * imgui.get_font().font_size ) - 2 - if imgui.menu_item("Reset vmin-vmax", None, False)[0]: + if imgui.menu_item("Reset vmin-vmax", "", False)[0]: self._lut_tool.image_graphic.reset_vmin_vmax() # add all the cmap options From 17730c4ef356513dffb61b4701147139c9337cbd Mon Sep 17 00:00:00 2001 From: kushalkolar Date: Thu, 16 Jan 2025 20:19:40 -0500 Subject: [PATCH 4/4] black --- fastplotlib/ui/right_click_menus/_standard_menu.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fastplotlib/ui/right_click_menus/_standard_menu.py b/fastplotlib/ui/right_click_menus/_standard_menu.py index a098f4b10..9a584043c 100644 --- a/fastplotlib/ui/right_click_menus/_standard_menu.py +++ b/fastplotlib/ui/right_click_menus/_standard_menu.py @@ -98,7 +98,9 @@ def update(self): # toggles to flip axes cameras for axis in ["x", "y", "z"]: scale = getattr(self.get_subplot().camera.local, f"scale_{axis}") - changed, flip = imgui.menu_item(f"Flip {axis} axis", "", bool(scale < 0)) + changed, flip = imgui.menu_item( + f"Flip {axis} axis", "", bool(scale < 0) + ) if changed: flip_axis(self.get_subplot(), axis, flip)