spacr 0.1.81__py3-none-any.whl → 0.1.85__py3-none-any.whl

spacr/gui.py

@@ -11,11 +11,12 @@ class MainApp(tk.Tk):
         super().__init__()
         width = self.winfo_screenwidth()
         height = self.winfo_screenheight()
-        self.geometry(f"{width}x{height}")  
+        self.geometry(f"{width}x{height}")
         self.title("SpaCr GUI Collection")
-        self.configure(bg="black")
+
+        # Initialize style and apply dark style to the main window
         style = ttk.Style()
-        set_dark_style(style)
+        self.color_settings = set_dark_style(style, parent_frame=self)
 
         self.main_gui_apps = {
             "Mask": (lambda frame: initiate_root(frame, 'mask'), "Generate cellpose masks for cells, nuclei and pathogen images."),
@@ -50,15 +51,18 @@ class MainApp(tk.Tk):
         create_menu_bar(self)
 
         # Create a canvas to hold the selected app and other elements
-        self.canvas = tk.Canvas(self, bg="black", highlightthickness=0)
+        self.canvas = tk.Canvas(self, highlightthickness=0)
         self.canvas.grid(row=0, column=0, sticky="nsew")
         self.grid_rowconfigure(0, weight=1)
         self.grid_columnconfigure(0, weight=1)
 
         # Create a frame inside the canvas to hold the main content
-        self.content_frame = tk.Frame(self.canvas, bg="black")
+        self.content_frame = tk.Frame(self.canvas)
         self.content_frame.pack(fill=tk.BOTH, expand=True)
 
+        # Apply dark style to canvas and content_frame
+        set_dark_style(ttk.Style(), containers=[self.canvas, self.content_frame])
+
         # Create startup screen with buttons for each main GUI app and drop-down for additional apps
         self.create_startup_screen()
 
@@ -66,19 +70,25 @@ class MainApp(tk.Tk):
         self.clear_frame(self.content_frame)
 
         # Create a frame for the logo and description
-        logo_frame = tk.Frame(self.content_frame, bg="black")
+        logo_frame = tk.Frame(self.content_frame)
         logo_frame.pack(pady=20, expand=True)
+        set_dark_style(ttk.Style(), containers=[logo_frame])
 
         # Load the logo image
         if not self.load_logo(logo_frame):
-            tk.Label(logo_frame, text="Logo not found", bg="black", fg="white", font=('Helvetica', 24)).pack(padx=10, pady=10)
+            logo_not_found = tk.Label(logo_frame, text="Logo not found", font=('Helvetica', 24))
+            logo_not_found.pack(padx=10, pady=10)
+            set_dark_style(ttk.Style(), widgets=[logo_not_found])
 
         # Add SpaCr text below the logo with padding for sharper text
-        tk.Label(logo_frame, text="SpaCr", bg="black", fg="#008080", font=('Helvetica', 24)).pack(padx=10, pady=10)
+        spacr_label = tk.Label(logo_frame, text="SpaCr", fg=self.color_settings['active_color'], font=('Helvetica', 24))
+        spacr_label.pack(padx=10, pady=10)
+        set_dark_style(ttk.Style(), widgets=[spacr_label])
 
         # Create a frame for the buttons and descriptions
-        buttons_frame = tk.Frame(self.content_frame, bg="black")
+        buttons_frame = tk.Frame(self.content_frame)
         buttons_frame.pack(pady=10, expand=True, padx=10)
+        set_dark_style(ttk.Style(), containers=[buttons_frame])
 
         for i, (app_name, app_data) in enumerate(self.main_gui_apps.items()):
             app_func, app_desc = app_data
@@ -87,17 +97,24 @@ class MainApp(tk.Tk):
             button = spacrButton(buttons_frame, text=app_name, command=lambda app_name=app_name, app_func=app_func: self.load_app(app_name, app_func), font=('Helvetica', 12))
             button.grid(row=i, column=0, pady=10, padx=10, sticky="w")
 
-            description_label = tk.Label(buttons_frame, text=app_desc, bg="black", fg="white", wraplength=800, justify="left", font=('Helvetica', 12))
+            description_label = tk.Label(buttons_frame, text=app_desc, wraplength=800, justify="left", font=('Helvetica', 12))
             description_label.grid(row=i, column=1, pady=10, padx=10, sticky="w")
+            set_dark_style(ttk.Style(), widgets=[description_label])
 
         # Add drop-down menu for additional apps
-        dropdown_frame = tk.Frame(buttons_frame, bg="black")
+        dropdown_frame = tk.Frame(buttons_frame)
         dropdown_frame.grid(row=len(self.main_gui_apps), column=0, columnspan=2, pady=20)
+        set_dark_style(ttk.Style(), containers=[dropdown_frame])
+
+        additional_apps_label = tk.Label(dropdown_frame, text="Additional Apps", font=('Helvetica', 12))
+        additional_apps_label.pack(side=tk.LEFT, padx=5)
+        set_dark_style(ttk.Style(), widgets=[additional_apps_label])
 
-        tk.Label(dropdown_frame, text="Additional Apps", bg="black", fg="white", font=('Helvetica', 12)).pack(side=tk.LEFT, padx=5)
         self.additional_apps_var = tk.StringVar(value="Select an app")
         dropdown = ttk.Combobox(dropdown_frame, textvariable=self.additional_apps_var, values=list(self.additional_gui_apps.keys()))
         dropdown.pack(side=tk.LEFT, padx=5)
+        set_dark_style(ttk.Style(), widgets=[dropdown])
+
         load_button = spacrButton(dropdown_frame, text="Load", command=self.load_additional_app, font=('Helvetica', 12))
         load_button.pack(side=tk.LEFT, padx=5)
 
@@ -141,9 +158,10 @@ class MainApp(tk.Tk):
             new_height = int(screen_height // 4)
             logo_image = logo_image.resize((new_height, new_height), Image.Resampling.LANCZOS)
             logo_photo = ImageTk.PhotoImage(logo_image)
-            logo_label = tk.Label(frame, image=logo_photo, bg="black")
+            logo_label = tk.Label(frame, image=logo_photo)
             logo_label.image = logo_photo  # Keep a reference to avoid garbage collection
             logo_label.pack()
+            set_dark_style(ttk.Style(), widgets=[logo_label])
             return True
         except Exception as e:
             print(f"An error occurred while processing the logo image: {e}")
@@ -154,8 +172,9 @@ class MainApp(tk.Tk):
         self.clear_frame(self.content_frame)
 
         # Initialize the selected app
-        app_frame = tk.Frame(self.content_frame, bg="black")
+        app_frame = tk.Frame(self.content_frame)
         app_frame.pack(fill=tk.BOTH, expand=True)
+        set_dark_style(ttk.Style(), containers=[app_frame])
         app_func(app_frame)
 
     def load_additional_app(self):

spacr/gui_core.py

@@ -17,7 +17,7 @@ except AttributeError:
     pass
 
 from .settings import set_default_train_test_model, get_measure_crop_settings, set_default_settings_preprocess_generate_masks, get_analyze_reads_default_settings, set_default_umap_image_settings
-from .gui_elements import create_menu_bar, spacrButton, spacrLabel, spacrFrame, spacrDropdownMenu ,set_dark_style, set_default_font
+from .gui_elements import spacrButton, spacrLabel, spacrFrame, spacrDropdownMenu ,set_dark_style, set_default_font
 
 # Define global variables
 q = None
@@ -271,17 +271,16 @@ def convert_settings_dict_for_gui(settings):
 
 def setup_settings_panel(vertical_container, settings_type='mask', window_dimensions=[500, 1000]):
     global vars_dict, scrollable_frame
-    from .settings import descriptions, get_identify_masks_finetune_default_settings, set_default_analyze_screen, set_default_settings_preprocess_generate_masks, get_measure_crop_settings, set_default_train_test_model, get_analyze_reads_default_settings, set_default_umap_image_settings, generate_fields, get_perform_regression_default_settings, get_train_cellpose_default_settings, get_map_barcodes_default_settings, get_analyze_recruitment_default_settings, get_check_cellpose_models_default_settings
+    from .settings import get_identify_masks_finetune_default_settings, set_default_analyze_screen, set_default_settings_preprocess_generate_masks, get_measure_crop_settings, set_default_train_test_model, get_analyze_reads_default_settings, set_default_umap_image_settings, generate_fields, get_perform_regression_default_settings, get_train_cellpose_default_settings, get_map_barcodes_default_settings, get_analyze_recruitment_default_settings, get_check_cellpose_models_default_settings
 
-    width = (window_dimensions[0])//6
+    width = (window_dimensions[0]) // 6
     height = window_dimensions[1]
 
-    # Settings Frame
-    settings_frame = tk.Frame(vertical_container, bg='black', height=height, width=width)
+    settings_frame = tk.Frame(vertical_container)
     vertical_container.add(settings_frame, stretch="always")
-    settings_label = spacrLabel(settings_frame, text="Settings", background="black", foreground="white", anchor='center', justify='center', align="center")
+    settings_label = spacrLabel(settings_frame, text="Settings", anchor='center', justify='center', align="center")
     settings_label.grid(row=0, column=0, pady=10, padx=10)
-    scrollable_frame = spacrFrame(settings_frame, bg='black', width=width)
+    scrollable_frame = spacrFrame(settings_frame)
     scrollable_frame.grid(row=1, column=0, sticky="nsew")
     settings_frame.grid_rowconfigure(1, weight=1)
     settings_frame.grid_columnconfigure(0, weight=1)
@@ -310,24 +309,18 @@ def setup_settings_panel(vertical_container, settings_type='mask', window_dimens
         settings = get_perform_regression_default_settings(settings={})
     elif settings_type == 'recruitment':
         settings = get_analyze_recruitment_default_settings(settings={})
-    #elif settings_type == 'simulation':
-    #    settings = set_default_
-    #elif settings_type == 'cellpose_dataset':
-    #    settings = set_default_
-    #elif settings_type == 'plaques':
-    #    settings = set_default_
-    #elif settings_type == 'cellpose_compare':
-    #    settings = set_default_
-    #elif settings_type == 'vision_scores':
-    #    settings = set_default_
-    #elif settings_type == 'vision_dataset':
-    #    settings = set_default_
     else:
         raise ValueError(f"Invalid settings type: {settings_type}")
 
-
     variables = convert_settings_dict_for_gui(settings)
     vars_dict = generate_fields(variables, scrollable_frame)
+    
+    containers = [settings_frame]
+    widgets = [settings_label, scrollable_frame]
+
+    style = ttk.Style(vertical_container)
+    _ = set_dark_style(style, containers=containers, widgets=widgets)
+
     print("Settings panel setup complete")
     return scrollable_frame, vars_dict
 
@@ -335,45 +328,57 @@ def setup_plot_section(vertical_container):
     global canvas, canvas_widget
     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')
+    figure = Figure(figsize=(30, 4), dpi=100)
     plot = figure.add_subplot(111)
     plot.plot([], [])  # This creates an empty plot.
     plot.axis('off')
     canvas = FigureCanvasTkAgg(figure, master=plot_frame)
-    canvas.get_tk_widget().configure(cursor='arrow', background='black', highlightthickness=0)
+    canvas.get_tk_widget().configure(cursor='arrow', highlightthickness=0)
     canvas_widget = canvas.get_tk_widget()
     plot_frame.add(canvas_widget, stretch="always")
     canvas.draw()
     canvas.figure = figure
+    # Set the figure and axes background to black
+    figure.patch.set_facecolor('black')
+    plot.set_facecolor('black')
+    containers = [plot_frame]
+    widgets = [canvas_widget]
+    style = ttk.Style(vertical_container)
+    _ = set_dark_style(style, containers=containers, widgets=widgets)
     return canvas, canvas_widget
 
 def setup_console(vertical_container):
     global console_output
-    print("Setting up console frame")
-    console_frame = tk.Frame(vertical_container, bg='black')
+    console_frame = tk.Frame(vertical_container)
     vertical_container.add(console_frame, stretch="always")
-    console_label = spacrLabel(console_frame, text="Console", background="black", foreground="white", anchor='center', justify='center', align="center")
+    console_label = spacrLabel(console_frame, text="Console", anchor='center', justify='center', align="center")
     console_label.grid(row=0, column=0, pady=10, padx=10)
-    console_output = scrolledtext.ScrolledText(console_frame, height=10, bg='black', fg='white', insertbackground='white')
+    console_output = scrolledtext.ScrolledText(console_frame, height=10)
     console_output.grid(row=1, column=0, sticky="nsew")
     console_frame.grid_rowconfigure(1, weight=1)
     console_frame.grid_columnconfigure(0, weight=1)
-    print("Console setup complete")
+    containers = [console_frame]
+    widgets = [console_label, console_output]
+    style = ttk.Style(vertical_container)
+    _ = set_dark_style(style, containers=containers, widgets=widgets)
     return console_output
 
 def setup_progress_frame(vertical_container):
     global progress_output
-    progress_frame = tk.Frame(vertical_container, bg='black')
+    progress_frame = tk.Frame(vertical_container)
     vertical_container.add(progress_frame, stretch="always")
-    label_frame = tk.Frame(progress_frame, bg='black')
+    label_frame = tk.Frame(progress_frame)
     label_frame.grid(row=0, column=0, sticky="ew", pady=(5, 0), padx=10)
-    progress_label = spacrLabel(label_frame, text="Processing: 0%", background="black", foreground="white", font=('Helvetica', 12), anchor='w', justify='left', align="left")
+    progress_label = spacrLabel(label_frame, text="Processing: 0%", font=('Helvetica', 12), anchor='w', justify='left', align="left")
     progress_label.grid(row=0, column=0, sticky="w")
-    progress_output = scrolledtext.ScrolledText(progress_frame, height=10, bg='black', fg='white', insertbackground='white')
+    progress_output = scrolledtext.ScrolledText(progress_frame, height=10)
     progress_output.grid(row=1, column=0, sticky="nsew")
     progress_frame.grid_rowconfigure(1, weight=1)
     progress_frame.grid_columnconfigure(0, weight=1)
-    print("Progress frame setup complete")
+    containers = [progress_frame, label_frame]
+    widgets = [progress_label, progress_output]
+    style = ttk.Style(vertical_container)
+    _ = set_dark_style(style, containers=containers, widgets=widgets)
     return progress_output
 
 def download_hug_dataset():
@@ -459,60 +464,70 @@ def download_dataset(repo_id, subfolder, local_dir=None, retries=5, delay=5):
 
     raise Exception("Failed to download files after multiple attempts.")
 
-def setup_button_section(horizontal_container, settings_type='mask',  window_dimensions=[500, 1000], run=True, abort=True, download=True, import_btn=True):
+def setup_button_section(horizontal_container, settings_type='mask', window_dimensions=[500, 1000], run=True, abort=True, download=True, import_btn=True):
     global button_frame, button_scrollable_frame, run_button, abort_button, download_dataset_button, import_button, q, fig_queue, vars_dict
     from .settings import descriptions
 
-    width = (window_dimensions[0])//8
+    width = (window_dimensions[0]) // 8
     height = window_dimensions[1]
 
-    button_frame = tk.Frame(horizontal_container, bg='black', height=height, width=width)
+    button_frame = tk.Frame(horizontal_container)
     horizontal_container.add(button_frame, stretch="always", sticky="nsew")
     button_frame.grid_rowconfigure(0, weight=0)
     button_frame.grid_rowconfigure(1, weight=1)
     button_frame.grid_columnconfigure(0, weight=1)
 
-    categories_label = spacrLabel(button_frame, text="Categories", background="black", foreground="white", font=('Helvetica', 12), anchor='center', justify='center', align="center")
+    categories_label = spacrLabel(button_frame, text="Categories", anchor='center', justify='center', align="center")
     categories_label.grid(row=0, column=0, pady=10, padx=10)
-    button_scrollable_frame = spacrFrame(button_frame, bg='black')
+    button_scrollable_frame = spacrFrame(button_frame)
     button_scrollable_frame.grid(row=1, column=0, sticky="nsew")
 
+    widgets = [categories_label, button_scrollable_frame.scrollable_frame]
+
     btn_col = 0
     btn_row = 1
-    
+
     if run:
-        run_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Run", command=lambda: start_process(q, fig_queue, settings_type), font=('Helvetica', 12))
+        run_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Run", command=lambda: start_process(q, fig_queue, settings_type))
         run_button.grid(row=btn_row, column=btn_col, pady=5, padx=5, sticky='ew')
+        widgets.append(run_button)
         btn_row += 1
 
     if abort and settings_type in ['mask', 'measure', 'classify', 'sequencing', 'umap']:
-        abort_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Abort", command=initiate_abort, font=('Helvetica', 12))
+        abort_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Abort", command=initiate_abort)
         abort_button.grid(row=btn_row, column=btn_col, pady=5, padx=5, sticky='ew')
+        widgets.append(abort_button)
         btn_row += 1
 
     if download and settings_type in ['mask']:
-        download_dataset_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Download", command=download_hug_dataset, font=('Helvetica', 12))
+        download_dataset_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Download", command=download_hug_dataset)
         download_dataset_button.grid(row=btn_row, column=btn_col, pady=5, padx=5, sticky='ew')
+        widgets.append(download_dataset_button)
         btn_row += 1
 
     if import_btn:
-        import_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Import", command=lambda: import_settings(settings_type), font=('Helvetica', 12))
+        import_button = spacrButton(button_scrollable_frame.scrollable_frame, text="Import", command=lambda: import_settings(settings_type))
         import_button.grid(row=btn_row, column=btn_col, pady=5, padx=5, sticky='ew')
+        widgets.append(import_button)
 
-    # Call toggle_settings after vars_dict is initialized
     if vars_dict is not None:
         toggle_settings(button_scrollable_frame)
 
-    # Description frame
-    description_frame = tk.Frame(horizontal_container, bg='black', height=height, width=width)
+    description_frame = tk.Frame(horizontal_container)
     horizontal_container.add(description_frame, stretch="always", sticky="nsew")
-    description_frame.grid_columnconfigure(0, weight=1)  # Make the column stretch
-    description_label = tk.Label(description_frame, text="Module Description", bg='black', fg='white', anchor='nw', justify='left', wraplength=width-50)
-    description_label.grid(row=0, column=0, pady=50, padx=20, sticky='nsew')  # Use sticky='nsew' to stretch the label
+    description_frame.grid_columnconfigure(0, weight=1)
+    description_label = tk.Label(description_frame, text="Module Description", anchor='nw', justify='left', wraplength=width - 50)
+    description_label.grid(row=0, column=0, pady=50, padx=20, sticky='nsew')
     description_text = descriptions.get(settings_type, "No description available for this module.")
     description_label.config(text=description_text)
 
-    return button_scrollable_frame
+    containers = [button_frame, description_frame]
+    widgets.extend([description_label])
+
+    style = ttk.Style(horizontal_container)
+    _ = set_dark_style(style, containers=containers, widgets=widgets)
+
+    return button_frame, button_scrollable_frame, description_frame, description_label
 
 def hide_all_settings(vars_dict, categories):
     """
@@ -561,7 +576,6 @@ def toggle_settings(button_scrollable_frame):
     def on_category_select(selected_category):
         if selected_category == "Select Category":
             return
-        #print(f"Selected category: {selected_category}")
         if selected_category in categories:
             toggle_category(categories[selected_category])
             if selected_category in active_categories:
@@ -569,7 +583,7 @@ def toggle_settings(button_scrollable_frame):
             else:
                 active_categories.add(selected_category)
         category_dropdown.update_styles(active_categories)
-        category_var.set("Select Category")  # Reset dropdown text to "Select Category"
+        category_var.set("Select Category")
 
     category_var = tk.StringVar()
     non_empty_categories = [category for category, settings in categories.items() if any(setting in vars_dict for setting in settings)]
@@ -627,24 +641,29 @@ def set_globals(q_var, console_output_var, parent_frame_var, vars_dict_var, canv
     progress_label = progress_label_var
     fig_queue = fig_queue_var
 
+def create_containers(parent_frame):
+    vertical_container = tk.PanedWindow(parent_frame, orient=tk.VERTICAL)
+    horizontal_container = tk.PanedWindow(vertical_container, orient=tk.HORIZONTAL)
+    settings_frame = tk.Frame(horizontal_container)
+    return vertical_container, horizontal_container, settings_frame
+
 def setup_frame(parent_frame):
     style = ttk.Style(parent_frame)
-    set_dark_style(style)
+    vertical_container, horizontal_container, settings_frame = create_containers(parent_frame)
+    containers = [vertical_container, horizontal_container, settings_frame]
+    
+    set_dark_style(style, parent_frame, containers)
     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)
-    vertical_container = tk.PanedWindow(parent_frame, orient=tk.VERTICAL, bg='black')
+    
     vertical_container.grid(row=0, column=0, sticky=tk.NSEW)
-    horizontal_container = tk.PanedWindow(vertical_container, orient=tk.HORIZONTAL, bg='black')
     vertical_container.add(horizontal_container, stretch="always")
     horizontal_container.grid_columnconfigure(0, weight=1)
     horizontal_container.grid_columnconfigure(1, weight=1)
-    settings_frame = tk.Frame(horizontal_container, bg='black')
     settings_frame.grid_rowconfigure(0, weight=0)
     settings_frame.grid_rowconfigure(1, weight=1)
     settings_frame.grid_columnconfigure(0, weight=1)
     horizontal_container.add(settings_frame, stretch="always", sticky="nsew")
+    
     return parent_frame, vertical_container, horizontal_container
 
 def initiate_root(parent, settings_type='mask'):

spacr/gui_elements.py

@@ -14,23 +14,97 @@ from collections import deque
 from skimage.draw import polygon, line
 from skimage.transform import resize
 from scipy.ndimage import binary_fill_holes, label
+from tkinter import ttk, scrolledtext
+
+def set_dark_style(style, parent_frame=None, containers=None, widgets=None, font_family="Arial", font_size=12, bg_color='black', fg_color='white', active_color='teal', inactive_color='gray'):
+
+    if active_color == 'teal':
+        active_color = '#008080'
+    if inactive_color == 'gray':
+        inactive_color = '#555555'
+    if bg_color == 'black':
+        bg_color = '#000000'
+    if fg_color == 'white':
+        fg_color = '#ffffff'
+
+    font_style = tkFont.Font(family=font_family, size=font_size)
+    style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', fieldbackground=bg_color, foreground=fg_color, font=font_style)
+    style.configure('TCombobox', fieldbackground=bg_color, background=bg_color, foreground=fg_color, selectbackground=bg_color, selectforeground=fg_color, font=font_style)
+    style.map('TCombobox', fieldbackground=[('readonly', bg_color)], foreground=[('readonly', fg_color)], selectbackground=[('readonly', bg_color)], selectforeground=[('readonly', fg_color)])
+    style.configure('Custom.TButton', background=bg_color, foreground=fg_color, bordercolor=fg_color, focusthickness=3, focuscolor=fg_color, font=(font_family, font_size))
+    style.map('Custom.TButton', background=[('active', active_color), ('!active', bg_color)], foreground=[('active', fg_color), ('!active', fg_color)], bordercolor=[('active', fg_color), ('!active', fg_color)])
+    style.configure('Custom.TLabel', padding='5 5 5 5', borderwidth=1, relief='flat', background=bg_color, foreground=fg_color, font=font_style)
+    style.configure('Spacr.TCheckbutton', background=bg_color, foreground=fg_color, indicatoron=False, relief='flat', font="15")
+    style.map('Spacr.TCheckbutton', background=[('selected', bg_color), ('active', bg_color)], foreground=[('selected', fg_color), ('active', fg_color)])
+    style.configure('TLabel', background=bg_color, foreground=fg_color, font=font_style)
+    style.configure('TFrame', background=bg_color)
+    style.configure('TPanedwindow', background=bg_color)
+    style.configure('TNotebook', background=bg_color, tabmargins=[2, 5, 2, 0])
+    style.configure('TNotebook.Tab', background=bg_color, foreground=fg_color, padding=[5, 5], font=font_style)
+    style.map('TNotebook.Tab', background=[('selected', active_color), ('active', active_color)], foreground=[('selected', fg_color), ('active', fg_color)])
+    style.configure('TButton', background=bg_color, foreground=fg_color, padding='5 5 5 5', font=font_style)
+    style.map('TButton', background=[('active', active_color), ('disabled', inactive_color)])
+    style.configure('Vertical.TScrollbar', background=bg_color, troughcolor=bg_color, bordercolor=bg_color)
+    style.configure('Horizontal.TScrollbar', background=bg_color, troughcolor=bg_color, bordercolor=bg_color)
+    style.configure('Custom.TLabelFrame', font=(font_family, font_size, 'bold'), background=bg_color, foreground='white', relief='solid', borderwidth=1)
+    style.configure('Custom.TLabelFrame.Label', background=bg_color, foreground='white', font=(font_family, font_size, 'bold'))
+
+    if parent_frame:
+        parent_frame.configure(bg=bg_color)
+        parent_frame.grid_rowconfigure(0, weight=1)
+        parent_frame.grid_columnconfigure(0, weight=1)
+
+    if containers:
+        for container in containers:
+            if isinstance(container, ttk.Frame):
+                container_style = ttk.Style()
+                container_style.configure(f'{container.winfo_class()}.TFrame', background=bg_color)
+                container.configure(style=f'{container.winfo_class()}.TFrame')
+            else:
+                container.configure(bg=bg_color)
+
+    if widgets:
+        for widget in widgets:
+            if isinstance(widget, (tk.Label, tk.Button, tk.Frame, ttk.LabelFrame, tk.Canvas)):
+                widget.configure(bg=bg_color)
+            if isinstance(widget, (tk.Label, tk.Button)):
+                widget.configure(fg=fg_color, font=(font_family, font_size))
+            if isinstance(widget, scrolledtext.ScrolledText):
+                widget.configure(bg=bg_color, fg=fg_color, insertbackground=fg_color)
+            if isinstance(widget, tk.OptionMenu):
+                widget.configure(bg=bg_color, fg=fg_color, font=(font_family, font_size))
+                menu = widget['menu']
+                menu.configure(bg=bg_color, fg=fg_color, font=(font_family, font_size))
+
+    return {'font_family':font_family, 'font_size':font_size, 'bg_color':bg_color, 'fg_color':fg_color, 'active_color':active_color, 'inactive_color':inactive_color}
+
+def set_default_font(root, font_name="Arial", 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)
 
 class spacrDropdownMenu(tk.OptionMenu):
     def __init__(self, parent, variable, options, command=None, **kwargs):
         self.variable = variable
         self.variable.set("Select Category")
         super().__init__(parent, self.variable, *options, command=command, **kwargs)
-        self.config(bg='black', fg='white', font=('Helvetica', 12), indicatoron=0)
+        self.update_styles()
+
+    def update_styles(self, active_categories=None):
+        style = ttk.Style()
+        style_out = set_dark_style(style, widgets=[self])
         self.menu = self['menu']
-        self.menu.config(bg='black', fg='white', font=('Helvetica', 12))
+        style_out = set_dark_style(style, widgets=[self.menu])
 
-    def update_styles(self, active_categories):
-        menu = self['menu']
-        for idx, option in enumerate(self['menu'].entrycget(idx, "label") for idx in range(self['menu'].index("end")+1)):
-            if option in active_categories:
-                menu.entryconfig(idx, background='teal', foreground='white')
-            else:
-                menu.entryconfig(idx, background='black', foreground='white')
+        if active_categories is not None:
+            for idx in range(self.menu.index("end") + 1):
+                option = self.menu.entrycget(idx, "label")
+                if option in active_categories:
+                    self.menu.entryconfig(idx, background=style_out['active_color'], foreground=style_out['fg_color'])
+                else:
+                    self.menu.entryconfig(idx, background=style_out['bg_color'], foreground=style_out['fg_color'])
 
 class spacrCheckbutton(ttk.Checkbutton):
     def __init__(self, parent, text="", variable=None, command=None, *args, **kwargs):
@@ -39,6 +113,9 @@ class spacrCheckbutton(ttk.Checkbutton):
         self.variable = variable if variable else tk.BooleanVar()
         self.command = command
         self.configure(text=self.text, variable=self.variable, command=self.command, style='Spacr.TCheckbutton')
+        style = ttk.Style()
+        _ = set_dark_style(style, widgets=[self])
+
 
 class spacrFrame(ttk.Frame):
     def __init__(self, container, width=None, *args, bg='black', **kwargs):
@@ -65,25 +142,25 @@ class spacrFrame(ttk.Frame):
         self.grid_columnconfigure(0, weight=1)
         self.grid_columnconfigure(1, weight=0)
         
-        for child in self.scrollable_frame.winfo_children():
-            child.configure(bg='black')
+        style = ttk.Style()
+        _ = set_dark_style(style, containers=[self], widgets=[canvas, scrollbar, self.scrollable_frame])
 
 class spacrLabel(tk.Frame):
     def __init__(self, parent, text="", font=None, style=None, align="right", **kwargs):
-        label_kwargs = {k: v for k, v in kwargs.items() if k in ['foreground', 'background', 'font', 'anchor', 'justify', 'wraplength']}
-        for key in label_kwargs.keys():
-            kwargs.pop(key)
-        super().__init__(parent, **kwargs)
+        valid_kwargs = {k: v for k, v in kwargs.items() if k not in ['foreground', 'background', 'font', 'anchor', 'justify', 'wraplength']}
+        super().__init__(parent, **valid_kwargs)
+        
         self.text = text
-        self.kwargs = label_kwargs
         self.align = align
         screen_height = self.winfo_screenheight()
         label_height = screen_height // 50
         label_width = label_height * 10
-        self.canvas = tk.Canvas(self, width=label_width, height=label_height, highlightthickness=0, bg=self.kwargs.get("background", "black"))
+        style_out = set_dark_style(ttk.Style())
+
+        self.canvas = tk.Canvas(self, width=label_width, height=label_height, highlightthickness=0, bg=style_out['bg_color'])
         self.canvas.grid(row=0, column=0, sticky="ew")
 
-        self.font_style = font if font else tkFont.Font(family=self.kwargs.get("font_family", "Helvetica"), size=self.kwargs.get("font_size", 12), weight=tkFont.NORMAL)
+        self.font_style = font if font else tkFont.Font(family=style_out['font_family'], size=style_out['font_size'], weight=tkFont.NORMAL)
         self.style = style
 
         if self.align == "center":
@@ -95,13 +172,15 @@ class spacrLabel(tk.Frame):
 
         if self.style:
             ttk_style = ttk.Style()
-            ttk_style.configure(self.style, **label_kwargs)
-            self.label_text = ttk.Label(self.canvas, text=self.text, style=self.style, anchor=text_anchor, justify=text_anchor)
+            ttk_style.configure(self.style, font=self.font_style, background=style_out['bg_color'], foreground=style_out['fg_color'])
+            self.label_text = ttk.Label(self.canvas, text=self.text, style=self.style, anchor=text_anchor)
             self.label_text.pack(fill=tk.BOTH, expand=True)
         else:
             self.label_text = self.canvas.create_text(label_width // 2 if self.align == "center" else label_width - 5, 
-                                                      label_height // 2, text=self.text, fill=self.kwargs.get("foreground", "white"), 
+                                                      label_height // 2, text=self.text, fill=style_out['fg_color'], 
                                                       font=self.font_style, anchor=anchor_value, justify=tk.RIGHT)
+        
+        _ = set_dark_style(ttk.Style(), containers=[self], widgets=[self.canvas])
 
     def set_text(self, text):
         if self.style:
@@ -112,22 +191,23 @@ class spacrLabel(tk.Frame):
 class spacrButton(tk.Frame):
     def __init__(self, parent, text="", command=None, font=None, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
+        
         self.text = text
         self.command = command
-        #screen_height = self.winfo_screenheight()
-        button_height = 50 #screen_height // 50
-        button_width = 140 #button_height * 3
-
-        #print(button_height, button_width)
+        button_height = 50 
+        button_width = 140
+        style_out = set_dark_style(ttk.Style())
 
-        # Increase the canvas size to accommodate the button and the rim
-        self.canvas = tk.Canvas(self, width=button_width + 4, height=button_height + 4, highlightthickness=0, bg="black")
+        # Create the canvas first
+        self.canvas = tk.Canvas(self, width=button_width + 4, height=button_height + 4, highlightthickness=0, bg=style_out['bg_color'])
         self.canvas.grid(row=0, column=0)
 
-        self.button_bg = self.create_rounded_rectangle(2, 2, button_width + 2, button_height + 2, radius=20, fill="#000000", outline="#ffffff")
+        # Apply dark style and get color settings
+        color_settings = set_dark_style(ttk.Style(), containers=[self], widgets=[self.canvas])
 
-        self.font_style = font if font else tkFont.Font(family="Helvetica", size=12, weight=tkFont.NORMAL)
-        self.button_text = self.canvas.create_text((button_width + 4) // 2, (button_height + 4) // 2, text=self.text, fill="white", font=self.font_style)
+        self.button_bg = self.create_rounded_rectangle(2, 2, button_width + 2, button_height + 2, radius=20, fill=color_settings['bg_color'], outline=color_settings['fg_color'])
+        self.font_style = font if font else tkFont.Font(family=color_settings['font_family'], size=color_settings['font_size'], weight=tkFont.NORMAL)
+        self.button_text = self.canvas.create_text((button_width + 4) // 2, (button_height + 4) // 2, text=self.text, fill=color_settings['fg_color'], font=self.font_style)
 
         self.bind("<Enter>", self.on_enter)
         self.bind("<Leave>", self.on_leave)
@@ -136,11 +216,15 @@ class spacrButton(tk.Frame):
         self.canvas.bind("<Leave>", self.on_leave)
         self.canvas.bind("<Button-1>", self.on_click)
 
+        self.bg_color = color_settings['bg_color']
+        self.active_color = color_settings['active_color']
+        self.fg_color = color_settings['fg_color']
+
     def on_enter(self, event=None):
-        self.canvas.itemconfig(self.button_bg, fill="#008080")  # Teal color
+        self.canvas.itemconfig(self.button_bg, fill=self.active_color)
 
     def on_leave(self, event=None):
-        self.canvas.itemconfig(self.button_bg, fill="#000000")  # Black color
+        self.canvas.itemconfig(self.button_bg, fill=self.bg_color)
 
     def on_click(self, event=None):
         if self.command:
@@ -177,17 +261,20 @@ class spacrSwitch(ttk.Frame):
         self.text = text
         self.variable = variable if variable else tk.BooleanVar()
         self.command = command
-        self.canvas = tk.Canvas(self, width=40, height=20, highlightthickness=0, bd=0, bg="black")
+        self.canvas = tk.Canvas(self, width=40, height=20, highlightthickness=0, bd=0)
         self.canvas.grid(row=0, column=1, padx=(10, 0))
         self.switch_bg = self.create_rounded_rectangle(2, 2, 38, 18, radius=9, outline="", fill="#fff")
-        self.switch = self.canvas.create_oval(4, 4, 16, 16, outline="", fill="#800080")  # Purple initially
-        self.label = spacrLabel(self, text=self.text, background="black", foreground="white")
+        self.switch = self.canvas.create_oval(4, 4, 16, 16, outline="", fill="#800080")
+        self.label = spacrLabel(self, text=self.text)
         self.label.grid(row=0, column=0, padx=(0, 10))
         self.bind("<Button-1>", self.toggle)
         self.canvas.bind("<Button-1>", self.toggle)
         self.label.bind("<Button-1>", self.toggle)
         self.update_switch()
 
+        style = ttk.Style()
+        _ = set_dark_style(style, containers=[self], widgets=[self.canvas, self.label])
+
     def toggle(self, event=None):
         self.variable.set(not self.variable.get())
         self.animate_switch()
@@ -196,19 +283,19 @@ class spacrSwitch(ttk.Frame):
 
     def update_switch(self):
         if self.variable.get():
-            self.canvas.itemconfig(self.switch, fill="#008080")  # Teal
-            self.canvas.coords(self.switch, 24, 4, 36, 16)  # Move switch to the right
+            self.canvas.itemconfig(self.switch, fill="#008080")
+            self.canvas.coords(self.switch, 24, 4, 36, 16)
         else:
-            self.canvas.itemconfig(self.switch, fill="#800080")  # Purple
-            self.canvas.coords(self.switch, 4, 4, 16, 16)  # Move switch to the left
+            self.canvas.itemconfig(self.switch, fill="#800080")
+            self.canvas.coords(self.switch, 4, 4, 16, 16)
 
     def animate_switch(self):
         if self.variable.get():
             start_x, end_x = 4, 24
-            final_color = "#008080"  # Teal
+            final_color = "#008080"
         else:
             start_x, end_x = 24, 4
-            final_color = "#800080"  # Purple
+            final_color = "#800080"
 
         self.animate_movement(start_x, end_x, final_color)
 
@@ -217,7 +304,7 @@ class spacrSwitch(ttk.Frame):
         for i in range(start_x, end_x, step):
             self.canvas.coords(self.switch, i, 4, i + 12, 16)
             self.canvas.update()
-            self.after(10)  # Small delay for smooth animation
+            self.after(10)
         self.canvas.itemconfig(self.switch, fill=final_color)
 
     def get(self):
@@ -227,7 +314,7 @@ class spacrSwitch(ttk.Frame):
         self.variable.set(value)
         self.update_switch()
 
-    def create_rounded_rectangle(self, x1, y1, x2, y2, radius=9, **kwargs):  # Smaller radius for smaller switch
+    def create_rounded_rectangle(self, x1, y1, x2, y2, radius=9, **kwargs):
         points = [x1 + radius, y1,
                   x1 + radius, y1,
                   x2 - radius, y1,
@@ -265,17 +352,18 @@ class spacrToolTip:
         self.tooltip_window = tk.Toplevel(self.widget)
         self.tooltip_window.wm_overrideredirect(True)
         self.tooltip_window.wm_geometry(f"+{x}+{y}")
-        self.tooltip_window.configure(bg='black')
-        label = tk.Label(self.tooltip_window, text=self.text, background="#333333", foreground="white", relief='flat', borderwidth=0)
+        label = tk.Label(self.tooltip_window, text=self.text, relief='flat', borderwidth=0)
         label.grid(row=0, column=0, padx=5, pady=5)
 
+        style = ttk.Style()
+        _ = set_dark_style(style, containers=[self.tooltip_window], widgets=[label])
+
     def hide_tooltip(self, event):
         if self.tooltip_window:
             self.tooltip_window.destroy()
         self.tooltip_window = None
 
 class modify_masks:
-
     def __init__(self, root, folder_path, scale_factor):
         self.root = root
         self.folder_path = folder_path
@@ -1465,35 +1553,4 @@ def create_menu_bar(root):
     app_menu.add_separator()
     app_menu.add_command(label="Exit", command=root.quit)
     # Configure the menu for the root window
-    root.config(menu=menu_bar)
-
-
-def set_dark_style(style):
-    font_style = tkFont.Font(family="Helvetica", size=24)
-    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', selectbackground='black', selectforeground='#ffffff', font=font_style)
-    style.map('TCombobox', fieldbackground=[('readonly', 'black')], foreground=[('readonly', '#ffffff')], selectbackground=[('readonly', 'black')], selectforeground=[('readonly', '#ffffff')])
-    style.configure('Custom.TButton', background='black', foreground='white', bordercolor='white', focusthickness=3, focuscolor='white', font=('Helvetica', 12))
-    style.map('Custom.TButton', background=[('active', 'teal'), ('!active', 'black')], foreground=[('active', 'white'), ('!active', 'white')], bordercolor=[('active', 'white'), ('!active', 'white')])
-    style.configure('Custom.TLabel', padding='5 5 5 5', borderwidth=1, relief='flat', background='black', foreground='#ffffff', font=font_style)
-    style.configure('Spacr.TCheckbutton', background='black', foreground='#ffffff', indicatoron=False, relief='flat', font="15")
-    style.map('Spacr.TCheckbutton', background=[('selected', 'black'), ('active', 'black')], foreground=[('selected', '#ffffff'), ('active', '#ffffff')])
-    style.configure('TLabel', background='black', foreground='#ffffff', font=font_style)
-    style.configure('TFrame', background='black')
-    style.configure('TPanedwindow', background='black')
-    style.configure('TNotebook', background='black', tabmargins=[2, 5, 2, 0])
-    style.configure('TNotebook.Tab', background='black', foreground='#ffffff', padding=[5, 5], font=font_style)
-    style.map('TNotebook.Tab', background=[('selected', '#555555'), ('active', '#555555')], foreground=[('selected', '#ffffff'), ('active', '#ffffff')])
-    style.configure('TButton', background='black', foreground='#ffffff', padding='5 5 5 5', font=font_style)
-    style.map('TButton', background=[('active', '#555555'), ('disabled', '#333333')])
-    style.configure('Vertical.TScrollbar', background='black', troughcolor='black', bordercolor='black')
-    style.configure('Horizontal.TScrollbar', background='black', troughcolor='black', bordercolor='black')
-    style.configure('Custom.TLabelFrame', font=('Helvetica', 10, 'bold'), background='black', foreground='white', relief='solid', borderwidth=1)
-    style.configure('Custom.TLabelFrame.Label', background='black', foreground='white', font=('Helvetica', 10, 'bold'))
-
-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)
+    root.config(menu=menu_bar)

{spacr-0.1.81.dist-info → spacr-0.1.85.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.1.81
+Version: 0.1.85
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson

{spacr-0.1.81.dist-info → spacr-0.1.85.dist-info}/RECORD

@@ -19,12 +19,12 @@ spacr/deep_spacr.py,sha256=ASBsN4JpHp_3S-91JUsB34IWTjTGPYI7jKV2qZnUR5M,37005
 spacr/foldseek.py,sha256=YIP1d4Ci6CeA9jSyiv-HTDbNmAmcSM9Y_DaOs7wYzLY,33546
 spacr/get_alfafold_structures.py,sha256=ehx_MQgb12k3hFecP6cYVlm5TLO8iWjgevy8ESyS3cw,3544
 spacr/graph_learning.py,sha256=1tR-ZxvXE3dBz1Saw7BeVFcrsUFu9OlUZeZVifih9eo,13070
-spacr/gui.py,sha256=OPIMDVVYyAKO3zJIrWkP_YIc9-SwQsVR2S7ynXu1wkQ,8901
+spacr/gui.py,sha256=1zzB3IKhGh7YYfU4p3vuABFLEn3AI2nLbWJ-CnH7LCk,9734
 spacr/gui_2.py,sha256=ZAI5quQYbhQJ40vK0NCqU_UMSPLkpfeQpomBWUSM0fc,6946
 spacr/gui_annotate.py,sha256=ugBksLGOHdtOLlEuRyyc59TrkYKu3rDf8JxEgiBSVao,6536
 spacr/gui_classify_app.py,sha256=Zi15ryc1ocYitRF4kyxlC27XxGyzfSPdvj2d6ZrSh7E,8446
-spacr/gui_core.py,sha256=PmElJrKHtEGYKpGTGgryxxvUvOHMh-wUmhvuHnyI13w,31833
-spacr/gui_elements.py,sha256=b0GJCHyrgJFeqB_IdjkXqMbXeC1reiLyiQ6-MTf_UuQ,73305
+spacr/gui_core.py,sha256=H_d_WVlGdMigAKlvG4xytFy1j8k7_EJDyR__OdSjBws,31846
+spacr/gui_elements.py,sha256=RzHRN_oXoiOWC8t8mYPH9D2eHT0xx7iyebQxJ4dNOjI,75760
 spacr/gui_make_masks_app.py,sha256=tl4M4Q2WQgrrwjRBJVevxJxpNowqzPhWkdCOm2UfRbw,45053
 spacr/gui_make_masks_app_v2.py,sha256=X3izTBXdCZDlkVe-fbG-jmCQtcAbmK0OIivjyWaLhug,30576
 spacr/gui_mask_app.py,sha256=mhTl_XzXLFl8Tx3WYEMpdYB_qw9u5JJa0EdkvlcIzAE,10706
@@ -46,15 +46,16 @@ spacr/sequencing.py,sha256=fHZRnoMSxmhMdadkei3lUeBdckqFyptWdQyWsDW3aaU,83304
 spacr/settings.py,sha256=VkRJHdzDtfGn_F8sJ5rfK80blZhpy21djxLfQcnlhGA,65665
 spacr/sim.py,sha256=FveaVgBi3eypO2oVB5Dx-v0CC1Ny7UPfXkJiiRRodAk,71212
 spacr/sim_app.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spacr/test_gui.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spacr/timelapse.py,sha256=KMYCgHzf9LTZe-lWl5mvH2EjbKRE6OhpwdY13wEumGc,39504
 spacr/utils.py,sha256=OQ8sSBH6VWx2xP_vh4ILJT71B46DFFhsq-Y6WxYdGhI,186891
 spacr/version.py,sha256=axH5tnGwtgSnJHb5IDhiu4Zjk5GhLyAEDRe-rnaoFOA,409
 spacr/models/cp/toxo_plaque_cyto_e25000_X1120_Y1120.CP_model,sha256=z8BbHWZPRnE9D_BHO0fBREE85c1vkltDs-incs2ytXQ,26566572
 spacr/models/cp/toxo_plaque_cyto_e25000_X1120_Y1120.CP_model_settings.csv,sha256=fBAGuL_B8ERVdVizO3BHozTDSbZUh1yFzsYK3wkQN68,420
 spacr/models/cp/toxo_pv_lumen.CP_model,sha256=2y_CindYhmTvVwBH39SNILF3rI3x9SsRn6qrMxHy3l0,26562451
-spacr-0.1.81.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
-spacr-0.1.81.dist-info/METADATA,sha256=E8m8oiUydIogb-0PipHqaIe-wden3HvcAcxSqkpqH9g,5050
-spacr-0.1.81.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-spacr-0.1.81.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
-spacr-0.1.81.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
-spacr-0.1.81.dist-info/RECORD,,
+spacr-0.1.85.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
+spacr-0.1.85.dist-info/METADATA,sha256=uAffhBMl-ibkrdDHadHFtwmw2MrN1cOHxIoLbe_Rpso,5050
+spacr-0.1.85.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+spacr-0.1.85.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
+spacr-0.1.85.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
+spacr-0.1.85.dist-info/RECORD,,