Merge pull request #1108 from annie-xd-wang/resizable-window

Resizable window

Author: AdvancedImagingUTSW

src/navigate/controller/controller.py

@@ -152,6 +152,8 @@ def __init__(
 
         #: Tk top-level widget: Tk.tk GUI instance.
         self.root = root
+        #: bool: Flag to indicate if the GUI is ready for resizing.
+        self.resize_ready_flag = False
 
         #: Tk top-level widget: Tk.tk GUI instance.
         self.splash_screen = splash_screen
@@ -346,8 +348,10 @@ def __init__(
 
         #: int: ID for the resize event.Only works on Windows OS.
         self.resize_event_id = None
-        if platform.system() == "Windows":
-            self.view.root.bind("<Configure>", self.resize)
+        self.window_width = 0
+        self.window_height = 0
+        self.view.root.after(5000, self.enable_resize)
+        self.view.root.bind("<Configure>", self.resize)
 
     def update_buffer(self):
         """Update the buffer size according to the camera
@@ -566,6 +570,12 @@ def update_experiment_setting(self):
             return warning_message
         return ""
 
+    def enable_resize(self):
+        """Enable window resizing.
+        
+        """
+        self.resize_ready_flag = True
+
     def resize(self, event):
         """Resize the GUI.
 
@@ -584,22 +594,27 @@ def refresh(width, height):
                 Width of the GUI.
             height : int
                 Height of the GUI.
-            """
-            if width < 1300 or height < 800:
-                return
-            self.view.camera_waveform["width"] = (
-                width - self.view.left_frame.winfo_width() - 35
-            )  #
-            self.view.camera_waveform["height"] = height - 117
-
-            print("camera_waveform height", self.view.camera_waveform["height"])
+            """         
+            self.view.scroll_frame.resize(width, height)
+            self.view.right_frame.config(
+                width=width-self.view.left_frame.winfo_width()-3,
+                height=height-self.view.left_frame.winfo_height()
+            )
+            
 
-        if event.widget != self.view.scroll_frame:
+        if not self.resize_ready_flag:
+            return
+        if event.widget != self.root:
             return
+        if event.width == self.window_width and event.height == self.window_height:
+            return
+
         if self.resize_event_id:
             self.view.after_cancel(self.resize_event_id)
+        self.window_width = event.width
+        self.window_height = event.height
         self.resize_event_id = self.view.after(
-            1000, lambda: refresh(event.width, event.height)
+            300, lambda: refresh(event.width, event.height)
         )
 
     def prepare_acquire_data(self):

src/navigate/controller/sub_controllers/camera_view.py

@@ -964,15 +964,28 @@ def resize(self, event: tk.Event) -> None:
         event : tk.Event
             Tkinter event.
         """
-        if self.view.is_popup is False and event.widget != self.view:
+        if not self.parent_controller.resize_ready_flag:
             return
-        if self.view.is_popup is True and event.widget.widgetName != "toplevel":
+        if event.width < 512 or event.height < 512:
             return
+        if event.widget != self.view:
+            return
+        if self.view.is_docked:
+            left_width = self.parent_controller.view.left_frame.winfo_width()
+            top_height = self.parent_controller.view.top_frame.winfo_height()
+            w_width = self.parent_controller.view.winfo_width()
+            w_height = self.parent_controller.view.winfo_height()
+            width = max(
+                w_width - left_width - 16, 560 + self.view.lut.winfo_width()
+            )
+            height = max(w_height - top_height - 50, 670)
+        else:
+            width = event.width
+            height = event.height - 24
+
         if self.resize_event_id:
             self.view.after_cancel(self.resize_event_id)
-        self.resize_event_id = self.view.after(
-            1000, lambda: self.refresh(event.width, event.height)
-        )
+        self.resize_event_id = self.view.after(300, lambda: self.refresh(width, height))
 
     def refresh(self, width: int, height: int) -> None:
         """Refresh the window.
@@ -984,17 +997,29 @@ def refresh(self, width: int, height: int) -> None:
         height : int
             Height of the window.
         """
-        if width == self.width and height == self.height:
+        if (
+            self.width
+            and self.height
+            and abs(width - self.width) < 10
+            and abs(height - self.height) < 10
+        ):
             return
         self.canvas_width = width - self.view.lut.winfo_width() - 24
-        self.canvas_height = height - 153
+        widget_height = 0
+        for widget in self.view.cam_image.winfo_children():
+            if widget != self.view.canvas:
+                if self.view.is_docked or widget.winfo_ismapped():
+                    widget_height += widget.winfo_height() + 5
+                    if widget.winfo_height() < 30:
+                        widget_height += 30
+                    
+        self.canvas_height = (
+            height - widget_height - (50 if self.view.is_docked else -5)
+        )
         self.view.canvas.config(width=self.canvas_width, height=self.canvas_height)
         self.view.update_idletasks()
 
-        if self.view.is_popup:
-            self.width, self.height = self.view.winfo_width(), self.view.winfo_height()
-        else:
-            self.width, self.height = width, height
+        self.width, self.height = width, height
 
         # if resize the window during acquisition, the image showing should be updated
         self.update_canvas_size()
@@ -1091,8 +1116,7 @@ def __init__(self, view, parent_controller=None) -> None:
         # Slider Binding
         self.view.slider.bind("<Motion>", self.slider_update)
 
-        if platform.system() == "Windows":
-            self.resize_event_id = self.view.bind("<Configure>", self.resize)
+        self.resize_event_id = self.view.bind("<Configure>", self.resize)
 
         #: str: The display state.
         self.display_state = "Live"
@@ -1450,8 +1474,7 @@ def __init__(self, view, parent_controller=None) -> None:
         #: dict: The render widgets.
         self.render_widgets = self.view.render.get_widgets()
 
-        if platform.system() == "Windows":
-            self.resize_event_id = self.view.bind("<Configure>", self.resize)
+        self.resize_event_id = self.view.bind("<Configure>", self.resize)
 
         #: bool: The display enabled flag.
         self.display_enabled = tk.BooleanVar()

src/navigate/view/custom_widgets/DockableNotebook.py

@@ -161,6 +161,7 @@ def popout(self) -> None:
         # Save the original index and the tab's text
         tab_widget._original_index = self.selected_tab_id
         tab_widget._saved_text: str = selected_text
+        tab_widget.is_docked = False
 
         # Remove the tab from the notebook
         if tab_widget in self.tab_list:
@@ -173,9 +174,6 @@ def popout(self) -> None:
 
         if selected_text == "Camera View":
             tk.Wm.minsize(tab_widget, 663, 597)
-            tab_widget.is_docked = False
-        elif selected_text == "Waveform Settings":
-            tab_widget.is_docked = False
 
     def dismiss(self, tab_widget):
         """Dismiss the popout window.
@@ -203,6 +201,7 @@ def dismiss(self, tab_widget):
         # Retrieve the original index and the saved text
         original_index = getattr(tab_widget, "_original_index", None)
         saved_text = getattr(tab_widget, "_saved_text", "Untitled")
+        tab_widget.is_docked = True
 
         if original_index is not None:
             current_count = self.index("end")

src/navigate/view/custom_widgets/scrollbars.py

@@ -58,28 +58,28 @@ def __init__(self, parent, *args, **kw):
         ttk.Frame.__init__(self, parent, *args, **kw)
 
         # Create a canvas object and a vertical scrollbar for scrolling it.
-        vscrollbar = ttk.Scrollbar(self, orient=tk.constants.VERTICAL)
-        vscrollbar.pack(
-            fill=tk.constants.Y, side=tk.constants.RIGHT, expand=tk.constants.FALSE
+        self.vscrollbar = ttk.Scrollbar(self, orient=tk.constants.VERTICAL)
+        self.vscrollbar.pack(
+            fill=tk.constants.Y, side=tk.constants.RIGHT, expand=tk.constants.TRUE
         )
-        hscrollbar = ttk.Scrollbar(self, orient=tk.constants.HORIZONTAL)
-        hscrollbar.pack(
-            fill=tk.constants.X, side=tk.constants.BOTTOM, expand=tk.constants.FALSE
+        self.hscrollbar = ttk.Scrollbar(self, orient=tk.constants.HORIZONTAL)
+        self.hscrollbar.pack(
+            fill=tk.constants.X, side=tk.constants.BOTTOM, expand=tk.constants.TRUE
         )
         #: tk.Canvas: The canvas object for the ScrolledFrame.
         self.canvas = tk.Canvas(
             self,
             bd=0,
             highlightthickness=0,
-            yscrollcommand=vscrollbar.set,
-            xscrollcommand=hscrollbar.set,
+            yscrollcommand=self.vscrollbar.set,
+            xscrollcommand=self.hscrollbar.set,
             scrollregion=(0, 0, 100, 100),
         )
         self.canvas.pack(
             side=tk.constants.LEFT, fill=tk.constants.BOTH, expand=tk.constants.TRUE
         )
-        vscrollbar.config(command=self.canvas.yview)
-        hscrollbar.config(command=self.canvas.xview)
+        self.vscrollbar.config(command=self.canvas.yview)
+        self.hscrollbar.config(command=self.canvas.xview)
 
         # Reset the view
         self.canvas.xview_moveto(0)
@@ -88,7 +88,7 @@ def __init__(self, parent, *args, **kw):
         # Create a frame inside the canvas which will be scrolled with it.
         #: ttk.Frame: The interior frame of the ScrolledFrame.
         self.interior = interior = ttk.Frame(self.canvas)
-        _ = self.canvas.create_window(0, 0, window=interior, anchor=tk.constants.NW)
+        self.interior_window = self.canvas.create_window(0, 0, window=interior, anchor=tk.constants.NW)
 
         # Track changes to the canvas and frame width and sync them,
         # also updating the scrollbar.
@@ -110,7 +110,20 @@ def _configure_interior(event):
             if interior.winfo_reqheight() != self.canvas.winfo_reqheight():
                 self.canvas.config(height=interior.winfo_reqheight())
 
-        interior.bind("<Configure>", _configure_interior)
+        self.bind_id = interior.bind("<Configure>", _configure_interior)
+
+    def unbind_autosize(self):
+        if self.bind_id:
+            self.interior.unbind("<Configure>", self.bind_id)
+            self.bind_id = 0
+
+    def resize(self, width, height):
+        self.unbind_autosize()
+        width = width-self.vscrollbar.winfo_width()
+        height = height-self.hscrollbar.winfo_height()
+        self.canvas.config(width=width)
+        self.canvas.config(height=height)
+        self.canvas.itemconfig(self.interior_window, width=width, height=height)
 
     def mouse_wheel(self, event):
         """Handle the mouse wheel event for scrolling.

src/navigate/view/main_application_window.py

@@ -44,6 +44,7 @@
 from navigate.view.main_window_content.acquire_notebook import AcquireBar
 from navigate.view.main_window_content.menus import Menubar
 from navigate.view.custom_widgets.scrollbars import ScrolledFrame
+from navigate.view.custom_widgets.common import uniform_grid
 
 # Logger Setup
 p = __name__.split(".")[1]
@@ -114,6 +115,8 @@ def __init__(self, root: tk.Tk, *args: Iterable, **kwargs: Dict[str, Any]) -> No
         #: tk.Tk: The main window of the application
         self.root = root
         self.root.title("navigate")
+        self.root.grid_rowconfigure(0, weight=1)
+        self.root.grid_columnconfigure(0, weight=1)
 
         # keep icons relative to view directory structure
         view_directory = Path(__file__).resolve().parent
@@ -124,6 +127,7 @@ def __init__(self, root: tk.Tk, *args: Iterable, **kwargs: Dict[str, Any]) -> No
             pass
 
         self.root.resizable(True, True)
+        self.root.minsize(1350, 750)
         self.root.geometry("")
 
         #: Menubar: The menu bar for the application
@@ -144,7 +148,7 @@ def __init__(self, root: tk.Tk, *args: Iterable, **kwargs: Dict[str, Any]) -> No
             row=0, column=0, columnspan=2, sticky=tk.NSEW, padx=3, pady=3
         )
         self.left_frame.grid(row=1, column=0, rowspan=2, sticky=tk.NSEW, padx=3, pady=3)
-        self.right_frame.grid(row=1, column=1, sticky=tk.NSEW, padx=3, pady=3)
+        self.right_frame.grid(row=1, column=1, sticky=tk.NW, padx=3, pady=3)
 
         #: SettingsNotebook: The settings notebook for the application
         self.settings = SettingsNotebook(self.left_frame, self.root)
@@ -154,3 +158,10 @@ def __init__(self, root: tk.Tk, *args: Iterable, **kwargs: Dict[str, Any]) -> No
 
         #: AcquireBar: The acquire bar for the application
         self.acquire_bar = AcquireBar(self.top_frame, self.root)
+
+        uniform_grid(self.scroll_frame.interior)
+        self.grid_rowconfigure(0, weight=0)
+        self.grid_columnconfigure(0, weight=0)
+        self.grid_rowconfigure(1, weight=1)
+        self.grid_columnconfigure(1, weight=1)
+        uniform_grid(self.right_frame)

src/navigate/view/main_window_content/display_notebook.py

@@ -90,6 +90,8 @@ def __init__(
         self.add(self.mip_tab, text="MIP", sticky=tk.NSEW)
         self.add(self.waveform_tab, text="Waveforms", sticky=tk.NSEW)
 
+        uniform_grid(self)
+
 
 class MIPTab(tk.Frame):
     """MipTab class."""
@@ -114,19 +116,13 @@ def __init__(
         #: int: The index of the tab.
         self.index = 1
 
-        #: Bool: The popup flag.
-        self.is_popup = False
-
         #: Bool: The docked flag.
         self.is_docked = True
 
         #: ttk.Frame: The frame that will hold the camera image.
         self.cam_image = ttk.Frame(self)
         self.cam_image.grid(row=0, column=0, rowspan=3, sticky=tk.NSEW)
 
-        #: bool: The popup flag.
-        self.is_popup = False
-
         #: bool: The docked flag.
         self.is_docked = True
 
@@ -182,16 +178,14 @@ def __init__(
         #: int: The index of the tab.
         self.index = 0
 
-        # Formatting
-        tk.Grid.columnconfigure(self, "all", weight=1)
-        tk.Grid.rowconfigure(self, "all", weight=1)
-
         #: ttk.Frame: The frame that will hold the camera image.
         self.cam_image = ttk.Frame(self)
-        self.cam_image.grid(row=0, column=0, rowspan=3, sticky=tk.NSEW)
+        self.cam_image.grid(row=0, column=0, sticky=tk.NSEW)
+        self.display_setting = ttk.Frame(self)
+        self.display_setting.grid(row=0, column=1, sticky=tk.NSEW)
 
-        #: bool: The popup flag.
-        self.is_popup = False
+        self.grid_rowconfigure(0, weight=1)
+        self.grid_columnconfigure(0, weight=1)
 
         #: bool: The docked flag.
         self.is_docked = True
@@ -214,13 +208,9 @@ def __init__(
         #: FigureCanvasTkAgg: The canvas that will hold the camera image.
         self.matplotlib_canvas = FigureCanvasTkAgg(self.matplotlib_figure, self.canvas)
 
-        #: IntensityFrame: The frame that will hold the scale settings/palette color.
-        self.lut = IntensityFrame(self)
-        self.lut.grid(row=0, column=1, sticky=tk.NSEW, padx=5, pady=5)
-
         #: tk.Scale: The slider that will hold the slice index.
         self.slider = tk.Scale(
-            self,
+            self.cam_image,
             from_=0,
             to=200,
             tickinterval=20,
@@ -229,19 +219,23 @@ def __init__(
             label="Slice",
         )
         self.slider.configure(state="disabled")
-        self.slider.grid(row=3, column=0, sticky=tk.NSEW, padx=5, pady=5)
+        self.slider.grid(row=1, column=0, sticky=tk.NSEW, padx=5, pady=5)
         self.slider.grid_remove()
 
         #: HistogramFrame: The frame that will hold the histogram.
-        self.histogram = HistogramFrame(self)
-        self.histogram.grid(row=4, column=0, sticky=tk.NSEW, padx=5, pady=5)
+        self.histogram = HistogramFrame(self.cam_image)
+        self.histogram.grid(row=2, column=0, sticky=tk.NSEW, padx=5, pady=5)
+
+        #: IntensityFrame: The frame that will hold the scale settings/palette color.
+        self.lut = IntensityFrame(self.display_setting)
+        self.lut.grid(row=0, column=1, sticky=tk.NSEW, padx=5, pady=5)
 
         #: MetricsFrame: The frame that will hold the camera selection and counts.
-        self.image_metrics = MetricsFrame(self)
+        self.image_metrics = MetricsFrame(self.display_setting)
         self.image_metrics.grid(row=1, column=1, sticky=tk.NSEW, padx=5, pady=5)
 
         #: RenderFrame: The frame that will hold the live display functionality.
-        self.live_frame = RenderFrame(self)
+        self.live_frame = RenderFrame(self.display_setting)
         self.live_frame.grid(row=2, column=1, sticky=tk.NSEW, padx=5, pady=5)