spacr 0.2.0__tar.gz → 0.2.2__tar.gz

{spacr-0.2.0/spacr.egg-info → spacr-0.2.2}/PKG-INFO

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

{spacr-0.2.0 → spacr-0.2.2}/setup.py

@@ -50,7 +50,7 @@ dependencies = [
 
 setup(
     name="spacr",
-    version="0.2.0",
+    version="0.2.2",
     author="Einar Birnir Olafsson",
     author_email="olafsson@med.umich.com",
     description="Spatial phenotype analysis of crisp screens (SpaCr)",

{spacr-0.2.0 → spacr-0.2.2}/spacr/gui.py

@@ -85,7 +85,7 @@ class MainApp(tk.Tk):
         set_dark_style(ttk.Style(), containers=[additional_buttons_frame])
 
         # Create a frame for the description below the icon grids
-        description_frame = tk.Frame(self.content_frame, height=70)  # Increased height to 70
+        description_frame = tk.Frame(self.content_frame, height=70)
         description_frame.pack(fill=tk.X, pady=10)
         description_frame.pack_propagate(False)  # Prevent the frame from resizing based on its content
         set_dark_style(ttk.Style(), containers=[description_frame])
@@ -110,7 +110,7 @@ class MainApp(tk.Tk):
         for i, (app_name, app_data) in enumerate(self.additional_gui_apps.items()):
             app_func, app_desc = app_data
             button = spacrButton(additional_buttons_frame, text=app_name, command=lambda app_name=app_name, app_func=app_func: self.load_app(app_name, app_func), icon_name=app_name.lower(), size=75, show_text=False)
-            button.grid(row=0, column=i, padx=5, pady=5)  # Ensure all icons are in a single row
+            button.grid(row=0, column=i, padx=5, pady=5)
             self.additional_buttons[button] = app_desc
 
         # Update description initially

{spacr-0.2.0 → spacr-0.2.2}/spacr/gui_elements.py

@@ -308,7 +308,7 @@ class spacrButton(tk.Frame):
         parent = self.master
         while parent:
             if hasattr(parent, 'show_description'):
-                parent.show_description(parent.main_buttons.get(self, "No description available."))
+                parent.show_description(parent.main_buttons.get(self, parent.additional_buttons.get(self, "No description available.")))
                 return
             parent = parent.master
 
@@ -343,7 +343,6 @@ class spacrButton(tk.Frame):
         self.canvas.itemconfig(self.button_icon, image=self.icon_photo)
         self.canvas.image = self.icon_photo  # Keep a reference to avoid garbage collection
 
-
 class spacrSwitch(ttk.Frame):
     def __init__(self, parent, text="", variable=None, command=None, *args, **kwargs):
         super().__init__(parent, *args, **kwargs)
@@ -1606,9 +1605,7 @@ class AnnotateApp:
         print(f'Quit application')
 
 def create_menu_bar(root):
-    from .gui_utils import load_app
-    from .gui_core import initiate_root
-
+    from .gui import initiate_root
     gui_apps = {
         "Mask": (lambda frame: initiate_root(frame, 'mask'), "Generate cellpose masks for cells, nuclei and pathogen images."),
         "Measure": (lambda frame: initiate_root(frame, 'measure'), "Measure single object intensity and morphological feature. Crop and save single object image"),
@@ -1627,19 +1624,23 @@ def create_menu_bar(root):
     }
 
     def load_app_wrapper(app_name, app_func):
-        load_app(root, app_name, app_func)
+        root.load_app(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_data in gui_apps.items():
         app_func, app_desc = app_data
         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)
+
     # Configure the menu for the root window
-    root.config(menu=menu_bar)
+    root.config(menu=menu_bar)

{spacr-0.2.0 → spacr-0.2.2/spacr.egg-info}/PKG-INFO

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