spacr 0.0.82__py3-none-any.whl → 0.1.1__py3-none-any.whl

spacr/gui_mask_app.py

@@ -97,19 +97,23 @@ def import_settings(scrollable_frame):
     vars_dict = generate_fields(new_settings, scrollable_frame)
 
 #@log_function_call
-def initiate_mask_root(parent_frame, width, height):
+def initiate_mask_root(parent_frame):
     global vars_dict, q, canvas, fig_queue, canvas_widget, thread_control, advanced_var, scrollable_frame
 
     style = ttk.Style(parent_frame)
     set_dark_style(style)
     style_text_boxes(style)
-    set_default_font(parent_frame, font_name="Arial", size=8)
+    set_default_font(parent_frame, font_name="Helvetica", size=8)
     parent_frame.configure(bg='black')
     parent_frame.grid_rowconfigure(0, weight=1)
     parent_frame.grid_columnconfigure(0, weight=1)
     
     fig_queue = Queue()
 
+    # Initialize after_tasks if not already done
+    if not hasattr(parent_frame, 'after_tasks'):
+        parent_frame.after_tasks = []
+
     def _process_fig_queue():
         global canvas
         try:
@@ -130,14 +134,20 @@ def initiate_mask_root(parent_frame, width, height):
         except Exception as e:
             traceback.print_exc()
         finally:
-            canvas_widget.after(100, _process_fig_queue)
+            after_id = canvas_widget.after(100, _process_fig_queue)
+            parent_frame.after_tasks.append(after_id)
 
     def _process_console_queue():
         while not q.empty():
             message = q.get_nowait()
             console_output.insert(tk.END, message)
             console_output.see(tk.END)
-        console_output.after(100, _process_console_queue)
+        after_id = console_output.after(100, _process_console_queue)
+        parent_frame.after_tasks.append(after_id)
+
+    # Clear previous content if any
+    for widget in parent_frame.winfo_children():
+        widget.destroy()
 
     vertical_container = tk.PanedWindow(parent_frame, orient=tk.HORIZONTAL)
     vertical_container.grid(row=0, column=0, sticky=tk.NSEW)
@@ -172,17 +182,17 @@ def initiate_mask_root(parent_frame, width, height):
     run_button.grid(row=45, column=0, pady=10, padx=10)
     abort_button = CustomButton(scrollable_frame.scrollable_frame, text="Abort", command=initiate_abort)
     abort_button.grid(row=45, column=1, pady=10, padx=10)
-    progress_label = ttk.Label(scrollable_frame.scrollable_frame, text="Processing: 0%", background="black", foreground="white") # Create progress field
+    progress_label = ttk.Label(scrollable_frame.scrollable_frame, text="Processing: 0%", background="black", foreground="white")
     progress_label.grid(row=50, column=0, columnspan=2, sticky="ew", pady=(5, 0), padx=10)
 
     # Plot Canvas Section
-    plot_frame = tk.PanedWindow(vertical_container, orient=tk.VERTICAL) # Horizontal container for Matplotlib figure and the vertical pane (for settings and console)
+    plot_frame = tk.PanedWindow(vertical_container, orient=tk.VERTICAL)
     vertical_container.add(plot_frame, stretch="always")
-    figure = Figure(figsize=(30, 4), dpi=100, facecolor='black') # Matplotlib figure setup
+    figure = Figure(figsize=(30, 4), dpi=100, facecolor='black')
     plot = figure.add_subplot(111)
     plot.plot([], [])  # This creates an empty plot.
     plot.axis('off')
-    canvas = FigureCanvasTkAgg(figure, master=plot_frame) # Embedd Matplotlib figure in Tkinter window
+    canvas = FigureCanvasTkAgg(figure, master=plot_frame)
     canvas.get_tk_widget().configure(cursor='arrow', background='black', highlightthickness=0)
     canvas_widget = canvas.get_tk_widget()
     plot_frame.add(canvas_widget, stretch="always")
@@ -206,15 +216,28 @@ def initiate_mask_root(parent_frame, width, height):
     _process_console_queue()
     _process_fig_queue()
     
-    parent_frame.after(100, lambda: main_thread_update_function(parent_frame, q, fig_queue, canvas_widget, progress_label))
+    after_id = parent_frame.after(100, lambda: main_thread_update_function(parent_frame, q, fig_queue, canvas_widget, progress_label))
+    parent_frame.after_tasks.append(after_id)
 
     return parent_frame, vars_dict
 
 def gui_mask():
     root = tk.Tk()
     root.geometry("1000x800")
-    root.title("SpaCer: generate masks")
-    initiate_mask_root(root, 1000, 800)
+    root.title("SpaCr: generate masks")
+    
+    # Clear previous content if any
+    if hasattr(root, 'content_frame'):
+        for widget in root.content_frame.winfo_children():
+            widget.destroy()
+        root.content_frame.grid_forget()
+    else:
+        root.content_frame = tk.Frame(root)
+        root.content_frame.grid(row=1, column=0, sticky="nsew")
+        root.grid_rowconfigure(1, weight=1)
+        root.grid_columnconfigure(0, weight=1)
+    
+    initiate_mask_root(root.content_frame)
     create_menu_bar(root)
     root.mainloop()
 

spacr/gui_measure_app.py

@@ -86,29 +86,24 @@ def initiate_abort():
         thread_control["run_thread"] = None
 
 #@log_function_call
-def import_settings(scrollable_frame):
-    global vars_dict
-
-    csv_file_path = filedialog.askopenfilename(filetypes=[("CSV files", "*.csv")])
-    csv_settings = read_settings_from_csv(csv_file_path)
-    variables = measure_variables()
-    new_settings = update_settings_from_csv(variables, csv_settings)
-    vars_dict = generate_fields(new_settings, scrollable_frame)
-
-#@log_function_call
-def initiate_measure_root(parent_frame):#, width, height):
+def initiate_measure_root(parent_frame):
     global vars_dict, q, canvas, fig_queue, canvas_widget, thread_control, variables, advanced_var, scrollable_frame
     
     style = ttk.Style(parent_frame)
     set_dark_style(style)
     style_text_boxes(style)
-    set_default_font(parent_frame, font_name="Arial", size=8)
+    set_default_font(parent_frame, font_name="Helvetica", size=8)
 
     parent_frame.configure(bg='black')
     parent_frame.grid_rowconfigure(0, weight=1)
     parent_frame.grid_columnconfigure(0, weight=1)
+
     fig_queue = Queue()
     
+    # Initialize after_tasks if not already done
+    if not hasattr(parent_frame, 'after_tasks'):
+        parent_frame.after_tasks = []
+
     def _process_fig_queue():
         global canvas
         try:
@@ -129,14 +124,20 @@ def initiate_measure_root(parent_frame):#, width, height):
         except Exception as e:
             traceback.print_exc()
         finally:
-            canvas_widget.after(100, _process_fig_queue)
+            after_id = canvas_widget.after(100, _process_fig_queue)
+            parent_frame.after_tasks.append(after_id)
 
     def _process_console_queue():
         while not q.empty():
             message = q.get_nowait()
             console_output.insert(tk.END, message)
             console_output.see(tk.END)
-        console_output.after(100, _process_console_queue)
+        after_id = console_output.after(100, _process_console_queue)
+        parent_frame.after_tasks.append(after_id)
+
+    # Clear previous content if any
+    for widget in parent_frame.winfo_children():
+        widget.destroy()
 
     vertical_container = tk.PanedWindow(parent_frame, orient=tk.HORIZONTAL)
     vertical_container.grid(row=0, column=0, sticky=tk.NSEW)
@@ -205,15 +206,29 @@ def initiate_measure_root(parent_frame):#, width, height):
     _process_console_queue()
     _process_fig_queue()
     
-    parent_frame.after(100, lambda: main_thread_update_function(parent_frame, q, fig_queue, canvas_widget, progress_label))
+    after_id = parent_frame.after(100, lambda: main_thread_update_function(parent_frame, q, fig_queue, canvas_widget, progress_label))
+    parent_frame.after_tasks.append(after_id)
     
     return parent_frame, vars_dict
 
+
 def gui_measure():
     root = tk.Tk()
     root.geometry("1000x800")
-    root.title("SpaCer: generate masks")
-    initiate_measure_root(root, 1000, 800)
+    root.title("SpaCr: measure objects")
+    
+    # Clear previous content if any
+    if hasattr(root, 'content_frame'):
+        for widget in root.content_frame.winfo_children():
+            widget.destroy()
+        root.content_frame.grid_forget()
+    else:
+        root.content_frame = tk.Frame(root)
+        root.content_frame.grid(row=1, column=0, sticky="nsew")
+        root.grid_rowconfigure(1, weight=1)
+        root.grid_columnconfigure(0, weight=1)
+    
+    initiate_measure_root(root.content_frame)
     create_menu_bar(root)
     root.mainloop()
 

spacr/gui_utils.py

@@ -40,21 +40,27 @@ class ToolTip:
             self.tooltip_window.destroy()
         self.tooltip_window = None
 
-
 def load_app(root, app_name, app_func):
-    # Destroy the current window
-    root.destroy()
-    # Create a new window for the app
-    app_window = tk.Tk()
-    app_window.title(f"SpaCr - {app_name}")
-    app_window.geometry("1200x800")
-    #app_window.attributes('-fullscreen', True)
-    app_window.configure(bg="black")
-    create_menu_bar(app_window)  # Add menu to the new window
-    app_func(app_window, app_window.winfo_width(), app_window.winfo_height())
+    # Cancel all scheduled after tasks
+    if hasattr(root, 'after_tasks'):
+        for task in root.after_tasks:
+            root.after_cancel(task)
+    root.after_tasks = []
+
+    # Clear the current content frame
+    if hasattr(root, 'content_frame'):
+        for widget in root.content_frame.winfo_children():
+            widget.destroy()
+    else:
+        root.content_frame = tk.Frame(root)
+        root.content_frame.grid(row=1, column=0, sticky="nsew")
+        root.grid_rowconfigure(1, weight=1)
+        root.grid_columnconfigure(0, weight=1)
 
-def create_menu_bar(root):
+    # Initialize the new app in the content frame
+    app_func(root.content_frame)
 
+def create_menu_bar(root):
     from .gui_mask_app import initiate_mask_root
     from .gui_measure_app import initiate_measure_root
     from .annotate_app import initiate_annotation_app_root
@@ -68,6 +74,10 @@ def create_menu_bar(root):
         "Make Masks": initiate_mask_app_root,
         "Classify": initiate_classify_root
     }
+
+    def load_app_wrapper(app_name, app_func):
+        load_app(root, app_name, app_func)
+
     # Create the menu bar
     menu_bar = tk.Menu(root, bg="#008080", fg="white")
     # Create a "SpaCr Applications" menu
@@ -75,7 +85,7 @@ def create_menu_bar(root):
     menu_bar.add_cascade(label="SpaCr Applications", menu=app_menu)
     # Add options to the "SpaCr Applications" menu
     for app_name, app_func in gui_apps.items():
-        app_menu.add_command(label=app_name, command=lambda app_name=app_name, app_func=app_func: load_app(root, app_name, app_func))
+        app_menu.add_command(label=app_name, command=lambda app_name=app_name, app_func=app_func: load_app_wrapper(app_name, app_func))
     # Add a separator and an exit option
     app_menu.add_separator()
     app_menu.add_command(label="Exit", command=root.quit)
@@ -83,7 +93,7 @@ def create_menu_bar(root):
     root.config(menu=menu_bar)
 
 class CustomButton(tk.Frame):
-    def __init__(self, parent, text="", command=None, *args, **kwargs):
+    def __init__(self, parent, text="", command=None, font=None, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
         self.text = text
         self.command = command
@@ -93,8 +103,8 @@ class CustomButton(tk.Frame):
 
         self.button_bg = self.create_rounded_rectangle(0, 0, 150, 50, radius=20, fill="#800080")
 
-        # Create a Tkinter font object using OpenSans
-        self.font_style = tkFont.Font(family="Arial", size=12, weight=tkFont.NORMAL)
+        # Use the passed font or default to Helvetica if not provided
+        self.font_style = font if font else tkFont.Font(family="Helvetica", size=12, weight=tkFont.NORMAL)
         self.button_text = self.canvas.create_text(75, 25, text=self.text, fill="white", font=self.font_style)
 
         self.bind("<Enter>", self.on_enter)
@@ -137,7 +147,7 @@ class CustomButton(tk.Frame):
                   x1, y1]
 
         return self.canvas.create_polygon(points, **kwargs, smooth=True)
-    
+
 class ToggleSwitch(ttk.Frame):
     def __init__(self, parent, text="", variable=None, command=None, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
@@ -226,15 +236,60 @@ class ToggleSwitch(ttk.Frame):
 
         return self.canvas.create_polygon(points, **kwargs, smooth=True)
     
-def set_default_font(root, font_name="Arial", size=12):
+def set_default_font(root, font_name="Helvetica", size=12):
     default_font = (font_name, size)
     root.option_add("*Font", default_font)
     root.option_add("*TButton.Font", default_font)
     root.option_add("*TLabel.Font", default_font)
     root.option_add("*TEntry.Font", default_font)
 
+def check_and_download_font_v1():
+    font_name = "Helvetica"
+    font_dir = "fonts"
+    font_path = os.path.join(font_dir, "OpenSans-Regular.ttf")
+
+    # Check if the font is already available
+    available_fonts = list(tkFont.families())
+    if font_name not in available_fonts:
+        print(f"Font '{font_name}' not found. Downloading...")
+        if not os.path.exists(font_dir):
+            os.makedirs(font_dir)
+
+        if not os.path.exists(font_path):
+            url = "https://github.com/google/fonts/blob/main/apache/opensans/OpenSans-Regular.ttf?raw=true"
+            response = requests.get(url)
+            with open(font_path, "wb") as f:
+                f.write(response.content)
+
+        # Load the font
+        try:
+            tkFont.nametofont("TkDefaultFont").configure(family=font_name, size=10)
+            tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
+            tkFont.nametofont("TkHeadingFont").configure(family=font_name, size=12)
+        except tk.TclError:
+            tkFont.nametofont("TkDefaultFont").configure(family="Helvetica", size=10)
+            tkFont.nametofont("TkTextFont").configure(family="Helvetica", size=10)
+            tkFont.nametofont("TkHeadingFont").configure(family="Helvetica", size=12)
+    else:
+        tkFont.nametofont("TkDefaultFont").configure(family=font_name, size=10)
+        tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
+        tkFont.nametofont("TkHeadingFont").configure(family=font_name, size=12)
+
+def style_text_boxes_v1(style):
+    check_and_download_font()
+    font_style = tkFont.Font(family="Helvetica", size=10)  # Define the Helvetica font
+    style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', fieldbackground='#000000', foreground='#ffffff', font=font_style)
+    style.configure('TCombobox', fieldbackground='#000000', background='#000000', foreground='#ffffff', font=font_style)
+    style.configure('Custom.TButton', padding='10 10 10 10', borderwidth=1, relief='solid', background='#008080', foreground='#ffffff', font=font_style)
+    style.map('Custom.TButton',
+              background=[('active', '#66b2b2'), ('disabled', '#004d4d'), ('!disabled', '#008080')],
+              foreground=[('active', '#ffffff'), ('disabled', '#888888')])
+    style.configure('Custom.TLabel', padding='5 5 5 5', borderwidth=1, relief='flat', background='#000000', foreground='#ffffff', font=font_style)
+    style.configure('TCheckbutton', background='#333333', foreground='#ffffff', indicatoron=False, relief='flat', font=font_style)
+    style.map('TCheckbutton', background=[('selected', '#555555'), ('active', '#555555')])
+
 def check_and_download_font():
-    font_name = "Arial"
+    font_name = "Helvetica"
     font_dir = "fonts"
     font_path = os.path.join(font_dir, "OpenSans-Regular.ttf")
 
@@ -257,9 +312,9 @@ def check_and_download_font():
             tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
             tkFont.nametofont("TkHeadingFont").configure(family=font_name, size=12)
         except tk.TclError:
-            tkFont.nametofont("TkDefaultFont").configure(family="Arial", size=10)
-            tkFont.nametofont("TkTextFont").configure(family="Arial", size=10)
-            tkFont.nametofont("TkHeadingFont").configure(family="Arial", size=12)
+            tkFont.nametofont("TkDefaultFont").configure(family="Helvetica", size=10)
+            tkFont.nametofont("TkTextFont").configure(family="Helvetica", size=10)
+            tkFont.nametofont("TkHeadingFont").configure(family="Helvetica", size=12)
     else:
         tkFont.nametofont("TkDefaultFont").configure(family=font_name, size=10)
         tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
@@ -267,7 +322,7 @@ def check_and_download_font():
 
 def style_text_boxes(style):
     check_and_download_font()
-    font_style = tkFont.Font(family="Arial", size=10)  # Define the Arial font
+    font_style = tkFont.Font(family="Helvetica", size=10)  # Define the Helvetica font
     style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', fieldbackground='#000000', foreground='#ffffff', font=font_style)
     style.configure('TCombobox', fieldbackground='#000000', background='#000000', foreground='#ffffff', font=font_style)
     style.configure('Custom.TButton', padding='10 10 10 10', borderwidth=1, relief='solid', background='#008080', foreground='#ffffff', font=font_style)
@@ -279,7 +334,6 @@ def style_text_boxes(style):
     style.map('TCheckbutton', background=[('selected', '#555555'), ('active', '#555555')])
 
 
-
 def read_settings_from_csv(csv_file_path):
     settings = {}
     with open(csv_file_path, newline='') as csvfile:
@@ -337,7 +391,7 @@ class ScrollableFrame(ttk.Frame):
         canvas.pack(side="left", fill="both", expand=True)
         scrollbar.pack(side="right", fill="y")
 
-class StdoutRedirector(object):
+class StdoutRedirector_v1(object):
     def __init__(self, text_widget):
         self.text_widget = text_widget
 
@@ -348,6 +402,21 @@ class StdoutRedirector(object):
     def flush(self):
         pass
 
+class StdoutRedirector:
+    def __init__(self, text_widget):
+        self.text_widget = text_widget
+
+    def write(self, string):
+        try:
+            if self.text_widget.winfo_exists():
+                self.text_widget.insert(tk.END, string)
+                self.text_widget.see(tk.END)
+        except tk.TclError:
+            pass  # Handle or log the error as needed
+
+    def flush(self):
+        pass
+
 def check_mask_gui_settings(vars_dict):
     settings = {}
     for key, var in vars_dict.items():
@@ -804,8 +873,6 @@ def generate_fields(variables, scrollable_frame):
         row += 1
     return vars_dict
 
-
-    
 class TextRedirector(object):
     def __init__(self, widget, queue):
         self.widget = widget
@@ -834,7 +901,7 @@ def create_dark_mode(root, style, console_output):
     style.map('TCombobox', fieldbackground=[('readonly', input_bg)], selectbackground=[('readonly', input_bg)], foreground=[('readonly', dark_text)])
     
     if console_output != None:
-        console_output.config(bg=dark_bg, fg=light_text, insertbackground=light_text) #, font=("Arial", 12)
+        console_output.config(bg=dark_bg, fg=light_text, insertbackground=light_text) #, font=("Helvetica", 12)
     root.configure(bg=dark_bg)
     
 def set_dark_style(style):
@@ -1025,4 +1092,4 @@ def run_multiple_simulations_wrapper(settings, q, fig_queue):
         q.put(errorMessage)  # Send the error message to the GUI via the queue
         traceback.print_exc()
     finally:
-        plt.show = original_show  # Restore the original plt.show function   
+        plt.show = original_show  # Restore the original plt.show function