spacr 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

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/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.dist-info → spacr-0.2.2.dist-info}/METADATA

@@ -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.dist-info → spacr-0.2.2.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=Cid9nA6OYAlYgcEbGhBuss2Y-vzIHCCDvhRhE46n4ao,8388
+spacr/gui.py,sha256=etiarQYeELx_zPRWH8hdrhtD_aVnuamnvrCOtUBO0kI,8322
 spacr/gui_2.py,sha256=OVRDbyHgoXCqGmTKt0C0ZQrJxTU4i-4eT2uYwk0w7CA,8322
 spacr/gui_annotate.py,sha256=ugBksLGOHdtOLlEuRyyc59TrkYKu3rDf8JxEgiBSVao,6536
 spacr/gui_classify_app.py,sha256=Zi15ryc1ocYitRF4kyxlC27XxGyzfSPdvj2d6ZrSh7E,8446
 spacr/gui_core.py,sha256=ay1IMMjcJLk8GeaXdL5rzu8xkJmpy_5XzqNhET_4SaI,33199
-spacr/gui_elements.py,sha256=yZ9_7-J9FHdkW_wbR7PaczWCGLNDx7jQ1xXr9PRX3AE,79786
+spacr/gui_elements.py,sha256=1vw6of9GcRUcEzZBxte3U5K--owAR_UzPO0pUuoqfk8,79784
 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
@@ -118,9 +118,9 @@ spacr/resources/icons/umap.png,sha256=2XvfWSYvLg85YPuPf3C5o8wNo7_ncg5v_GBsKwzRfC
 spacr/resources/models/cp/toxo_plaque_cyto_e25000_X1120_Y1120.CP_model,sha256=z8BbHWZPRnE9D_BHO0fBREE85c1vkltDs-incs2ytXQ,26566572
 spacr/resources/models/cp/toxo_plaque_cyto_e25000_X1120_Y1120.CP_model_settings.csv,sha256=fBAGuL_B8ERVdVizO3BHozTDSbZUh1yFzsYK3wkQN68,420
 spacr/resources/models/cp/toxo_pv_lumen.CP_model,sha256=2y_CindYhmTvVwBH39SNILF3rI3x9SsRn6qrMxHy3l0,26562451
-spacr-0.2.0.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
-spacr-0.2.0.dist-info/METADATA,sha256=P1ZDTEigKdkpiIe0X1epqwtuwG3G5tuw_-B_7AHJ-Ag,5049
-spacr-0.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-spacr-0.2.0.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
-spacr-0.2.0.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
-spacr-0.2.0.dist-info/RECORD,,
+spacr-0.2.2.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
+spacr-0.2.2.dist-info/METADATA,sha256=DfgYpGaXumaUI-rBxM2mkOnU58Rno9FCLSkHDVugSt8,5049
+spacr-0.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+spacr-0.2.2.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
+spacr-0.2.2.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
+spacr-0.2.2.dist-info/RECORD,,