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

spacr/gui_mask_app.py

@@ -174,13 +174,15 @@ def initiate_mask_root(parent_frame):
     vars_dict['Test mode'] = (None, None, tk.BooleanVar(value=False))
     
     # Button section
-    test_mode_button = CustomButton(scrollable_frame.scrollable_frame, text="Test Mode", command=toggle_test_mode)
+    test_mode_button = CustomButton(scrollable_frame.scrollable_frame, text="Test Mode", command=toggle_test_mode, font=('Helvetica', 10))
+    #CustomButton(buttons_frame, text=app_name, command=lambda app_name=app_name: self.load_app(app_name, app_func), font=('Helvetica', 12))
+
     test_mode_button.grid(row=47, column=1, pady=10, padx=10)
-    import_btn = CustomButton(scrollable_frame.scrollable_frame, text="Import", command=lambda: import_settings(scrollable_frame))
+    import_btn = CustomButton(scrollable_frame.scrollable_frame, text="Import", command=lambda: import_settings(scrollable_frame), font=('Helvetica', 10))
     import_btn.grid(row=47, column=0, pady=10, padx=10)
     run_button = CustomButton(scrollable_frame.scrollable_frame, text="Run", command=lambda: start_process(q, fig_queue))
     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 = CustomButton(scrollable_frame.scrollable_frame, text="Abort", command=initiate_abort, font=('Helvetica', 10))
     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")
     progress_label.grid(row=50, column=0, columnspan=2, sticky="ew", pady=(5, 0), padx=10)
@@ -223,7 +225,9 @@ def initiate_mask_root(parent_frame):
 
 def gui_mask():
     root = tk.Tk()
-    root.geometry("1000x800")
+    width = root.winfo_screenwidth()
+    height = root.winfo_screenheight()
+    root.geometry(f"{width}x{height}")    
     root.title("SpaCr: generate masks")
     
     # Clear previous content if any

spacr/gui_measure_app.py

@@ -19,6 +19,15 @@ from .gui_utils import measure_variables, measure_crop_wrapper, clear_canvas, ch
 
 thread_control = {"run_thread": None, "stop_requested": False}
 
+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)
+
 def toggle_test_mode():
     global vars_dict
     current_state = vars_dict['test_mode'][2].get()
@@ -166,11 +175,11 @@ def initiate_measure_root(parent_frame):
     # Button section
     test_mode_button = CustomButton(scrollable_frame.scrollable_frame, text="Test Mode", command=toggle_test_mode)
     test_mode_button.grid(row=47, column=1, pady=10, padx=10)
-    import_btn = CustomButton(scrollable_frame.scrollable_frame, text="Import Settings", command=lambda: import_settings(scrollable_frame))
+    import_btn = CustomButton(scrollable_frame.scrollable_frame, text="Import", command=lambda: import_settings(scrollable_frame), font=('Helvetica', 10))
     import_btn.grid(row=47, column=0, pady=20, padx=20)
-    run_button = CustomButton(scrollable_frame.scrollable_frame, text="Run", command=lambda: start_process(q, fig_queue))
+    run_button = CustomButton(scrollable_frame.scrollable_frame, text="Run", command=lambda: start_process(q, fig_queue), font=('Helvetica', 10))
     run_button.grid(row=45, column=0, pady=20, padx=20)
-    abort_button = CustomButton(scrollable_frame.scrollable_frame, text="Abort", command=initiate_abort)
+    abort_button = CustomButton(scrollable_frame.scrollable_frame, text="Abort", command=initiate_abort, font=('Helvetica', 10))
     abort_button.grid(row=45, column=1, pady=20, padx=20)
     progress_label = ttk.Label(scrollable_frame.scrollable_frame, text="Processing: 0%", background="black", foreground="white") # Create progress field
     progress_label.grid(row=50, column=0, columnspan=2, sticky="ew", pady=(5, 0), padx=10)
@@ -211,10 +220,11 @@ def initiate_measure_root(parent_frame):
     
     return parent_frame, vars_dict
 
-
 def gui_measure():
     root = tk.Tk()
-    root.geometry("1000x800")
+    width = root.winfo_screenwidth()
+    height = root.winfo_screenheight()
+    root.geometry(f"{width}x{height}") 
     root.title("SpaCr: measure objects")
     
     # Clear previous content if any

spacr/gui_utils.py

@@ -47,6 +47,10 @@ def load_app(root, app_name, app_func):
             root.after_cancel(task)
     root.after_tasks = []
 
+    # Exit functionality only for the annotation app
+    if app_name == "Annotate" and hasattr(root, 'current_app_exit_func'):
+        root.current_app_exit_func()
+
     # Clear the current content frame
     if hasattr(root, 'content_frame'):
         for widget in root.content_frame.winfo_children():
@@ -61,11 +65,11 @@ def load_app(root, app_name, app_func):
     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
-    from .mask_app import initiate_mask_app_root
-    from .gui_classify_app import initiate_classify_root
+    from .app_mask import initiate_mask_root
+    from .app_measure import initiate_measure_root
+    from .app_annotate import initiate_annotation_app_root
+    from .app_make_masks import initiate_mask_app_root
+    from .app_classify import initiate_classify_root
 
     gui_apps = {
         "Mask": initiate_mask_root,
@@ -92,6 +96,92 @@ def create_menu_bar(root):
     # Configure the menu for the root window
     root.config(menu=menu_bar)
 
+def proceed_with_app(root, app_name, app_func):
+
+    from .app_mask import gui_mask
+    from .app_measure import gui_measure
+    from .app_annotate import gui_annotate
+    from .app_make_masks import gui_make_masks
+    from .app_classify import gui_classify
+    from .gui import gui_app
+
+    # 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)
+
+    # Initialize the new app in the content frame
+    if app_name == "Main App":
+        root.destroy()  # Close the current window
+        gui_app()  # Open the main app window
+    elif app_name == "Mask":
+        gui_mask()
+    elif app_name == "Measure":
+        gui_measure()
+    elif app_name == "Annotate":
+        gui_annotate()
+    elif app_name == "Make Masks":
+        gui_make_masks()
+    elif app_name == "Classify":
+        gui_classify()
+    else:
+        raise ValueError(f"Invalid app name: {app_name}")
+
+def load_app(root, app_name, app_func):
+    # Cancel all scheduled after tasks
+    if hasattr(root, 'after_tasks'):
+        for task in root.after_tasks:
+            root.after_cancel(task)
+    root.after_tasks = []
+
+    # Exit functionality only for the annotation app
+    if app_name != "Annotate" and hasattr(root, 'current_app_exit_func'):
+        root.next_app_func = proceed_with_app
+        root.next_app_args = (app_name, app_func)  # Ensure correct arguments
+        root.current_app_exit_func()
+    else:
+        proceed_with_app(root, app_name, app_func)
+
+
+def create_menu_bar(root):
+    from .app_mask import initiate_mask_root
+    from .app_measure import initiate_measure_root
+    from .app_annotate import initiate_annotation_app_root
+    from .app_make_masks import initiate_mask_app_root
+    from .app_classify import initiate_classify_root
+    from .gui import gui_app 
+
+    gui_apps = {
+        "Main App": gui_app,
+        "Mask": initiate_mask_root,
+        "Measure": initiate_measure_root,
+        "Annotate": initiate_annotation_app_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
+    app_menu = tk.Menu(menu_bar, tearoff=0, bg="#008080", fg="white")
+    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_wrapper(app_name, app_func))
+    # Add a separator and an exit option
+    app_menu.add_separator()
+    app_menu.add_command(label="Exit", command=root.destroy)  # Use root.destroy instead of root.quit
+    # Configure the menu for the root window
+    root.config(menu=menu_bar)
+
 class CustomButton(tk.Frame):
     def __init__(self, parent, text="", command=None, font=None, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
@@ -275,19 +365,6 @@ def check_and_download_font_v1():
         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 = "Helvetica"
     font_dir = "fonts"
@@ -320,7 +397,7 @@ def check_and_download_font():
         tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
         tkFont.nametofont("TkHeadingFont").configure(family=font_name, size=12)
 
-def style_text_boxes(style):
+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)
@@ -330,9 +407,22 @@ def style_text_boxes(style):
               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.configure('TCheckbutton', background='black', foreground='#ffffff', indicatoron=False, relief='flat', font=font_style)
     style.map('TCheckbutton', background=[('selected', '#555555'), ('active', '#555555')])
 
+def style_text_boxes(style):
+    font_style = tkFont.Font(family="Helvetica", size=10) 
+    style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', fieldbackground='black', foreground='#ffffff', font=font_style)
+    style.configure('TCombobox', fieldbackground='black', background='black', 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='black', foreground='#ffffff', indicatoron=False, relief='flat', font=font_style)
+    style.map('TCheckbutton', background=[('selected', '#555555'), ('active', '#555555')])
+
+
 
 def read_settings_from_csv(csv_file_path):
     settings = {}