spacr 0.2.67__tar.gz → 0.2.68__tar.gz

{spacr-0.2.67/spacr.egg-info → spacr-0.2.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.2.67
+Version: 0.2.68
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -47,6 +47,9 @@ Requires-Dist: gpustat<2.0,>=1.1.1
 Requires-Dist: pyautogui<1.0,>=0.9.54
 Requires-Dist: tables<4.0,>=3.8.0
 Requires-Dist: rapidfuzz<4.0,>=3.9
+Requires-Dist: importlib-metadata<4.0,>=3.6
+Requires-Dist: keyring<16.0,>=15.1
+Requires-Dist: screeninfo<1.0,>=0.8.1
 Requires-Dist: huggingface-hub<0.25,>=0.24.0
 Provides-Extra: dev
 Requires-Dist: pytest<3.11,>=3.9; extra == "dev"

{spacr-0.2.67 → spacr-0.2.68}/setup.py

@@ -44,12 +44,15 @@ dependencies = [
     'pyautogui>=0.9.54,<1.0',
     'tables>=3.8.0,<4.0',
     'rapidfuzz>=3.9, <4.0',
+    'importlib-metadata>=3.6, <4.0',
+    'keyring>=15.1, <16.0',
+    'screeninfo>=0.8.1,<1.0',
     'huggingface-hub>=0.24.0,<0.25'
 ]
 
 setup(
     name="spacr",
-    version="0.2.67",
+    version="0.2.68",
     author="Einar Birnir Olafsson",
     author_email="olafsson@med.umich.com",
     description="Spatial phenotype analysis of crisp screens (SpaCr)",

{spacr-0.2.67 → spacr-0.2.68}/spacr/gui.py

@@ -3,6 +3,7 @@ from tkinter import ttk
 from multiprocessing import set_start_method
 from .gui_elements import spacrButton, create_menu_bar, set_dark_style
 from .gui_core import initiate_root
+from screeninfo import get_monitors
 
 class MainApp(tk.Tk):
     def __init__(self, default_app=None):
@@ -12,12 +13,23 @@ class MainApp(tk.Tk):
         self.geometry("100x100")
         self.update_idletasks()
 
-        # Expand the window to fullscreen
-        self.attributes('-fullscreen', True)
+        # Get the current window position
         self.update_idletasks()
-
-        width = self.winfo_screenwidth()
-        height = self.winfo_screenheight()
+        x = self.winfo_x()
+        y = self.winfo_y()
+
+        # Find the monitor where the window is located
+        for monitor in get_monitors():
+            if monitor.x <= x < monitor.x + monitor.width and monitor.y <= y < monitor.y + monitor.height:
+                width = monitor.width
+                height = monitor.height
+                break
+        else:
+            monitor = get_monitors()[0]
+            width = monitor.width
+            height = monitor.height
+
+        # Set the window size to the dimensions of the monitor where it is located
         self.geometry(f"{width}x{height}")
         self.title("SpaCr GUI Collection")
         self.configure(bg='#333333')  # Set window background to dark gray
@@ -36,7 +48,6 @@ class MainApp(tk.Tk):
         }
 
         self.additional_gui_apps = {
-            #"Sequencing": (lambda frame: initiate_root(self, 'sequencing'), "Analyze sequencing data."),
             "Umap": (lambda frame: initiate_root(self, 'umap'), "Generate UMAP embeddings with datapoints represented as images."),
             "Train Cellpose": (lambda frame: initiate_root(self, 'train_cellpose'), "Train custom Cellpose models."),
             "ML Analyze": (lambda frame: initiate_root(self, 'ml_analyze'), "Machine learning analysis of data."),
@@ -58,32 +69,36 @@ class MainApp(tk.Tk):
     def create_widgets(self):
         create_menu_bar(self)
 
-        self.canvas = tk.Canvas(self, highlightthickness=0)
-        self.canvas.grid(row=0, column=0, sticky="nsew")
+        # Use a grid layout for centering
         self.grid_rowconfigure(0, weight=1)
         self.grid_columnconfigure(0, weight=1)
 
-        self.content_frame = tk.Frame(self.canvas)
+        self.content_frame = tk.Frame(self)
         self.content_frame.grid(row=0, column=0, sticky="nsew")
+        
+        # Center the content frame within the window
+        self.content_frame.grid_rowconfigure(0, weight=1)
+        self.content_frame.grid_columnconfigure(0, weight=1)
 
-        self.canvas.create_window((self.winfo_screenwidth() // 2, self.winfo_screenheight() // 2), window=self.content_frame, anchor="center")
-
-        set_dark_style(ttk.Style(), containers=[self.canvas, self.content_frame])
+        self.inner_frame = tk.Frame(self.content_frame)
+        self.inner_frame.grid(row=0, column=0)
+        
+        set_dark_style(ttk.Style(), containers=[self.content_frame, self.inner_frame])
 
         self.create_startup_screen()
 
     def create_startup_screen(self):
-        self.clear_frame(self.content_frame)
+        self.clear_frame(self.inner_frame)
 
-        main_buttons_frame = tk.Frame(self.content_frame)
+        main_buttons_frame = tk.Frame(self.inner_frame)
         main_buttons_frame.pack(pady=10)
         set_dark_style(ttk.Style(), containers=[main_buttons_frame])
 
-        additional_buttons_frame = tk.Frame(self.content_frame)
+        additional_buttons_frame = tk.Frame(self.inner_frame)
         additional_buttons_frame.pack(pady=10)
         set_dark_style(ttk.Style(), containers=[additional_buttons_frame])
 
-        description_frame = tk.Frame(self.content_frame, height=70)
+        description_frame = tk.Frame(self.inner_frame, height=70)
         description_frame.pack(fill=tk.X, pady=10)
         description_frame.pack_propagate(False)
         set_dark_style(ttk.Style(), containers=[description_frame])
@@ -93,7 +108,7 @@ class MainApp(tk.Tk):
 
         logo_button = spacrButton(main_buttons_frame, text="SpaCr", command=lambda: self.load_app("logo_spacr", initiate_root), icon_name="logo_spacr", size=100, show_text=False)
         logo_button.grid(row=0, column=0, padx=5, pady=5)
-        self.main_buttons[logo_button] = "SpaCr provides a flexible toolset to extract single-cell images and measurements from high-content cell painting experiments, train deep-learning models to classify cellular/subcellular phenotypes, simulate, and analyze pooled CRISPR-Cas9 imaging screens.."
+        self.main_buttons[logo_button] = "SpaCr provides a flexible toolset to extract single-cell images and measurements from high-content cell painting experiments, train deep-learning models to classify cellular/subcellular phenotypes, simulate, and analyze pooled CRISPR-Cas9 imaging screens."
 
         for i, (app_name, app_data) in enumerate(self.main_gui_apps.items()):
             app_func, app_desc = app_data
@@ -127,9 +142,9 @@ class MainApp(tk.Tk):
             self.description_label.update_idletasks()
 
     def load_app(self, app_name, app_func):
-        self.clear_frame(self.canvas)
+        self.clear_frame(self.inner_frame)
 
-        app_frame = tk.Frame(self.canvas)
+        app_frame = tk.Frame(self.inner_frame)
         app_frame.pack(fill=tk.BOTH, expand=True)
         set_dark_style(ttk.Style(), containers=[app_frame])
         app_func(app_frame)
@@ -144,4 +159,4 @@ def gui_app():
 
 if __name__ == "__main__":
     set_start_method('spawn', force=True)
-    gui_app()
+    gui_app()

{spacr-0.2.67 → spacr-0.2.68}/spacr/gui_utils.py

@@ -574,32 +574,43 @@ def setup_frame(parent_frame):
     size_dict = set_element_size()
     style_out = set_dark_style(style)
 
-    settings_container = tk.PanedWindow(parent_frame, orient=tk.VERTICAL, width=size_dict['settings_width'], bg=style_out['bg_color'])
-    vertical_container = tk.PanedWindow(parent_frame, orient=tk.VERTICAL, width=size_dict['panel_width'], bg=style_out['bg_color'])
-    horizontal_container = tk.PanedWindow(parent_frame, orient=tk.HORIZONTAL, height=size_dict['panel_height'], width=size_dict['panel_width'], bg=style_out['bg_color'])
+    # Configure the main layout using PanedWindow
+    main_paned = tk.PanedWindow(parent_frame, orient=tk.HORIZONTAL, bg=style_out['bg_color'], bd=0, relief='flat')
+    main_paned.grid(row=0, column=0, sticky="nsew")
 
+    # Allow the main_paned to expand and fill the window
     parent_frame.grid_rowconfigure(0, weight=1)
-    parent_frame.grid_rowconfigure(1, weight=0)
-    parent_frame.grid_columnconfigure(0, weight=0)
-    parent_frame.grid_columnconfigure(1, weight=1)
+    parent_frame.grid_columnconfigure(0, weight=1)
 
-    settings_container.grid(row=0, column=0, rowspan=2, sticky="nsew")
-    vertical_container.grid(row=0, column=1, sticky="nsew")
-    horizontal_container.grid(row=1, column=1, sticky="ew")
+    # Create the settings container on the left
+    settings_container = tk.PanedWindow(main_paned, orient=tk.VERTICAL, width=size_dict['settings_width'], bg=style_out['bg_color'], bd=0, relief='flat')
+    main_paned.add(settings_container, minsize=100)  # Allow resizing with a minimum size
 
-    # Ensure settings_container maintains its width
-    settings_container.grid_propagate(False)
-    settings_container.update_idletasks()
+    # Create a right container frame to hold vertical and horizontal containers
+    right_frame = tk.Frame(main_paned, bg=style_out['bg_color'], bd=0, highlightthickness=0, relief='flat')
+    main_paned.add(right_frame, stretch="always")
 
-    tk.Label(settings_container, text="Settings Container", bg=style_out['bg_color']).grid(row=0, column=0, sticky="ew")
+    # Configure the right_frame grid layout
+    right_frame.grid_rowconfigure(0, weight=1)  # Vertical container expands
+    right_frame.grid_rowconfigure(1, weight=0)  # Horizontal container at bottom
+    right_frame.grid_columnconfigure(0, weight=1)
 
-    set_dark_style(style, parent_frame, [settings_container, vertical_container, horizontal_container])
-    
-    #size = style_out['font_size'] - 2
-    #set_default_font(parent_frame, font_name=style_out['font_family'], size=size)
+    # Inside right_frame, add vertical_container at the top
+    vertical_container = tk.PanedWindow(right_frame, orient=tk.VERTICAL, bg=style_out['bg_color'], bd=0, relief='flat')
+    vertical_container.grid(row=0, column=0, sticky="nsew")
+
+    # Add horizontal_container aligned with the bottom of settings_container
+    horizontal_container = tk.PanedWindow(right_frame, orient=tk.HORIZONTAL, height=size_dict['panel_height'], bg=style_out['bg_color'], bd=0, relief='flat')
+    horizontal_container.grid(row=1, column=0, sticky="ew")
+
+    # Example content for settings_container
+    tk.Label(settings_container, text="Settings Container", bg=style_out['bg_color']).pack(fill=tk.BOTH, expand=True)
+
+    set_dark_style(style, parent_frame, [settings_container, vertical_container, horizontal_container, main_paned])
 
     return parent_frame, vertical_container, horizontal_container, settings_container
 
+
 def download_hug_dataset(q, vars_dict):
     dataset_repo_id = "einarolafsson/toxo_mito"
     settings_repo_id = "einarolafsson/spacr_settings"

{spacr-0.2.67 → spacr-0.2.68/spacr.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.2.67
+Version: 0.2.68
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson
@@ -47,6 +47,9 @@ Requires-Dist: gpustat<2.0,>=1.1.1
 Requires-Dist: pyautogui<1.0,>=0.9.54
 Requires-Dist: tables<4.0,>=3.8.0
 Requires-Dist: rapidfuzz<4.0,>=3.9
+Requires-Dist: importlib-metadata<4.0,>=3.6
+Requires-Dist: keyring<16.0,>=15.1
+Requires-Dist: screeninfo<1.0,>=0.8.1
 Requires-Dist: huggingface-hub<0.25,>=0.24.0
 Provides-Extra: dev
 Requires-Dist: pytest<3.11,>=3.9; extra == "dev"

{spacr-0.2.67 → spacr-0.2.68}/spacr.egg-info/requires.txt

@@ -36,6 +36,9 @@ gpustat<2.0,>=1.1.1
 pyautogui<1.0,>=0.9.54
 tables<4.0,>=3.8.0
 rapidfuzz<4.0,>=3.9
+importlib-metadata<4.0,>=3.6
+keyring<16.0,>=15.1
+screeninfo<1.0,>=0.8.1
 huggingface-hub<0.25,>=0.24.0
 
 [dev]