spacr 0.0.21__py3-none-any.whl → 0.0.35__py3-none-any.whl

spacr/gui_utils.py

@@ -1,19 +1,208 @@
-import spacr, inspect, traceback, io, sys, ast, ctypes, matplotlib, re, csv
+import os, spacr, inspect, traceback, io, sys, ast, ctypes, matplotlib, re, csv, requests
 import matplotlib.pyplot as plt
 matplotlib.use('Agg')
 import numpy as np
 import tkinter as tk
 from tkinter import ttk, messagebox
-from tkinter.font import nametofont
+import tkinter.font as tkFont
 from torchvision import models
 
+from .logger import log_function_call
+
 try:
     ctypes.windll.shcore.SetProcessDpiAwareness(True)
 except AttributeError:
     pass
 
-from .logger import log_function_call
+def load_app(root, app_name, app_func):
+    # Destroy the current window
+    root.destroy()
+    # Create a new window for the app
+    app_window = tk.Tk()
+    app_window.title(f"SpaCr - {app_name}")
+    app_window.geometry("1200x800")
+    #app_window.attributes('-fullscreen', True)
+    app_window.configure(bg="black")
+    create_menu_bar(app_window)  # Add menu to the new window
+    app_func(app_window, app_window.winfo_width(), app_window.winfo_height())
+
+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
+
+    gui_apps = {
+        "Mask": initiate_mask_root,
+        "Measure": initiate_measure_root,
+        "Annotate": initiate_annotation_app_root,
+        "Make Masks": initiate_mask_app_root,
+        "Classify": initiate_classify_root
+    }
+    # 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(root, 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)
+
+class CustomButton(tk.Frame):
+    def __init__(self, parent, text="", command=None, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+        self.text = text
+        self.command = command
+
+        self.canvas = tk.Canvas(self, width=200, height=50, highlightthickness=0, bg="black")
+        self.canvas.grid(row=0, column=0)
+
+        self.button_bg = self.create_rounded_rectangle(0, 0, 200, 50, radius=20, fill="#800080")
+
+        # Load the Open Sans font
+        self.font_path = 'fonts/OpenSans-Regular.ttf'
+        if not os.path.exists(self.font_path):
+            self.download_font()
+
+        self.open_sans = tkFont.Font(family="Open Sans", size=10)
+        self.button_text = self.canvas.create_text(100, 25, text=self.text, fill="white", font=self.open_sans)
+
+        self.bind("<Enter>", self.on_enter)
+        self.bind("<Leave>", self.on_leave)
+        self.bind("<Button-1>", self.on_click)
+        self.canvas.bind("<Enter>", self.on_enter)
+        self.canvas.bind("<Leave>", self.on_leave)
+        self.canvas.bind("<Button-1>", self.on_click)
+
+    def on_enter(self, event=None):
+        self.canvas.itemconfig(self.button_bg, fill="#993399")
+
+    def on_leave(self, event=None):
+        self.canvas.itemconfig(self.button_bg, fill="#800080")
+
+    def on_click(self, event=None):
+        if self.command:
+            self.command()
+
+    def create_rounded_rectangle(self, x1, y1, x2, y2, radius=20, **kwargs):
+        points = [x1 + radius, y1,
+                  x1 + radius, y1,
+                  x2 - radius, y1,
+                  x2 - radius, y1,
+                  x2, y1,
+                  x2, y1 + radius,
+                  x2, y1 + radius,
+                  x2, y2 - radius,
+                  x2, y2 - radius,
+                  x2, y2,
+                  x2 - radius, y2,
+                  x2 - radius, y2,
+                  x1 + radius, y2,
+                  x1 + radius, y2,
+                  x1, y2,
+                  x1, y2 - radius,
+                  x1, y2 - radius,
+                  x1, y1 + radius,
+                  x1, y1 + radius,
+                  x1, y1]
+
+        return self.canvas.create_polygon(points, **kwargs, smooth=True)
+
+class ToggleSwitch(ttk.Frame):
+    def __init__(self, parent, text="", variable=None, command=None, *args, **kwargs):
+        super().__init__(parent, *args, **kwargs)
+        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.grid(row=0, column=1, padx=(10, 0))
+        
+        # Background rounded rectangle with smaller dimensions and no outline
+        self.switch_bg = self.create_rounded_rectangle(2, 2, 38, 18, radius=9, outline="", fill="#fff")
 
+        # Switch ball with no outline
+        self.switch = self.canvas.create_oval(4, 4, 16, 16, outline="", fill="#800080")  # Purple initially
+        
+        self.label = ttk.Label(self, text=self.text, background="black", foreground="white")
+        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()
+
+    def toggle(self, event=None):
+        self.variable.set(not self.variable.get())
+        self.animate_switch()
+        if self.command:
+            self.command()
+
+    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
+        else:
+            self.canvas.itemconfig(self.switch, fill="#800080")  # Purple
+            self.canvas.coords(self.switch, 4, 4, 16, 16)  # Move switch to the left
+
+    def animate_switch(self):
+        if self.variable.get():
+            start_x, end_x = 4, 24
+            final_color = "#008080"  # Teal
+        else:
+            start_x, end_x = 24, 4
+            final_color = "#800080"  # Purple
+
+        self.animate_movement(start_x, end_x, final_color)
+
+    def animate_movement(self, start_x, end_x, final_color):
+        step = 1 if start_x < end_x else -1
+        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.canvas.itemconfig(self.switch, fill=final_color)
+
+    def get(self):
+        return self.variable.get()
+
+    def set(self, value):
+        self.variable.set(value)
+        self.update_switch()
+
+    def create_rounded_rectangle(self, x1, y1, x2, y2, radius=9, **kwargs):  # Smaller radius for smaller switch
+        points = [x1 + radius, y1,
+                  x1 + radius, y1,
+                  x2 - radius, y1,
+                  x2 - radius, y1,
+                  x2, y1,
+                  x2, y1 + radius,
+                  x2, y1 + radius,
+                  x2, y2 - radius,
+                  x2, y2 - radius,
+                  x2, y2,
+                  x2 - radius, y2,
+                  x2 - radius, y2,
+                  x1 + radius, y2,
+                  x1 + radius, y2,
+                  x1, y2,
+                  x1, y2 - radius,
+                  x1, y2 - radius,
+                  x1, y1 + radius,
+                  x1, y1 + radius,
+                  x1, y1]
+
+        return self.canvas.create_polygon(points, **kwargs, smooth=True)
+    
 def set_default_font(root, font_name="Helvetica", size=12):
     default_font = (font_name, size)
     root.option_add("*Font", default_font)
@@ -21,13 +210,63 @@ def set_default_font(root, font_name="Helvetica", size=12):
     root.option_add("*TLabel.Font", default_font)
     root.option_add("*TEntry.Font", default_font)
 
+def check_and_download_font():
+    font_name = "Open Sans"
+    font_dir = "fonts"
+    font_path = os.path.join(font_dir, "OpenSans-Regular.ttf")
+
+    # Check if the font is already available
+    available_fonts = list(tkFont.families())
+    if font_name not in available_fonts:
+        print(f"Font '{font_name}' not found. Downloading...")
+        if not os.path.exists(font_dir):
+            os.makedirs(font_dir)
+
+        if not os.path.exists(font_path):
+            url = "https://github.com/google/fonts/blob/main/apache/opensans/OpenSans-Regular.ttf?raw=true"
+            response = requests.get(url)
+            with open(font_path, "wb") as f:
+                f.write(response.content)
+
+        # Load the font
+        try:
+            tkFont.nametofont("TkDefaultFont").configure(family=font_name, size=10)
+            tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
+            tkFont.nametofont("TkHeadingFont").configure(family=font_name, size=12)
+        except tk.TclError:
+            tkFont.nametofont("TkDefaultFont").configure(family="Open Sans", size=10)
+            tkFont.nametofont("TkTextFont").configure(family="Open Sans", size=10)
+            tkFont.nametofont("TkHeadingFont").configure(family="Open Sans", size=12)
+    else:
+        tkFont.nametofont("TkDefaultFont").configure(family=font_name, size=10)
+        tkFont.nametofont("TkTextFont").configure(family=font_name, size=10)
+        tkFont.nametofont("TkHeadingFont").configure(family=font_name, size=12)
+
+def style_text_boxes_v1(style):
+    style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', fieldbackground='#000000', foreground='#ffffff')
+    style.configure('TCombobox', fieldbackground='#000000', background='#000000', foreground='#ffffff')
+    style.configure('Custom.TButton', padding='10 10 10 10', borderwidth=1, relief='solid', background='#008080', foreground='#ffffff', font=('Open Sans', 10, 'bold'))
+    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=('Open Sans', 10))
+    style.configure('TCheckbutton', background='#333333', foreground='#ffffff', indicatoron=False, relief='flat')
+    style.map('TCheckbutton', background=[('selected', '#555555'), ('active', '#555555')])
+
 def style_text_boxes(style):
-    style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', background='#333333', foreground='#ffffff')
-    style.configure('TButton', padding='10 10 10 10', borderwidth=1, relief='solid', background='#444444', foreground='#ffffff', font=('Helvetica', 12, 'bold'))
-    style.map('TButton',
-              background=[('active', '#555555'), ('disabled', '#222222')],
+    check_and_download_font()
+    open_sans = tkFont.Font(family="Open Sans", size=10)  # Define the Open Sans font
+    style.configure('TEntry', padding='5 5 5 5', borderwidth=1, relief='solid', fieldbackground='#000000', foreground='#ffffff', font=open_sans)
+    style.configure('TCombobox', fieldbackground='#000000', background='#000000', foreground='#ffffff', font=open_sans)
+    style.configure('Custom.TButton', padding='10 10 10 10', borderwidth=1, relief='solid', background='#008080', foreground='#ffffff', font=open_sans)
+    style.map('Custom.TButton',
+              background=[('active', '#66b2b2'), ('disabled', '#004d4d'), ('!disabled', '#008080')],
               foreground=[('active', '#ffffff'), ('disabled', '#888888')])
-    style.configure('TLabel', padding='5 5 5 5', borderwidth=1, relief='flat', background='#2e2e2e', foreground='#ffffff')
+    style.configure('Custom.TLabel', padding='5 5 5 5', borderwidth=1, relief='flat', background='#000000', foreground='#ffffff', font=open_sans)
+    style.configure('TCheckbutton', background='#333333', foreground='#ffffff', indicatoron=False, relief='flat', font=open_sans)
+    style.map('TCheckbutton', background=[('selected', '#555555'), ('active', '#555555')])
+
+
 
 def read_settings_from_csv(csv_file_path):
     settings = {}
@@ -66,17 +305,8 @@ def disable_interactivity(fig):
         for handler_id in list(handlers.keys()):
             fig.canvas.mpl_disconnect(handler_id)
 
-def set_default_font_v1(app, font_name="Arial Bold", size=10):
-    default_font = nametofont("TkDefaultFont")
-    text_font = nametofont("TkTextFont")
-    fixed_font = nametofont("TkFixedFont")
-    
-    # Set the family to Open Sans and size as desired
-    for font in (default_font, text_font, fixed_font):
-        font.config(family=font_name, size=size)
-
 class ScrollableFrame(ttk.Frame):
-    def __init__(self, container, *args, bg='#333333', **kwargs):
+    def __init__(self, container, *args, bg='black', **kwargs):
         super().__init__(container, *args, **kwargs)
         self.configure(style='TFrame')  # Ensure this uses the styled frame from dark mode
         
@@ -381,32 +611,31 @@ def classify_variables():
     }
     return variables
     
-
-#@log_function_call
 def create_input_field(frame, label_text, row, var_type='entry', options=None, default_value=None):
-    label = ttk.Label(frame, text=label_text, style='TLabel')  # Assuming you have a dark mode style for labels too
+    label = ttk.Label(frame, text=label_text, style='Custom.TLabel')  # Apply Custom.TLabel style for labels
     label.grid(column=0, row=row, sticky=tk.W, padx=5, pady=5)
     
     if var_type == 'entry':
         var = tk.StringVar(value=default_value)  # Set default value
-        entry = ttk.Entry(frame, textvariable=var, style='TEntry')  # Assuming you have a dark mode style for entries
+        entry = ttk.Entry(frame, textvariable=var, style='TEntry')  # Apply TEntry style for entries
         entry.grid(column=1, row=row, sticky=tk.EW, padx=5)
+        return (label, entry, var)  # Return both the label and the entry, and the variable
     elif var_type == 'check':
         var = tk.BooleanVar(value=default_value)  # Set default value (True/False)
-        # Use the custom style for Checkbutton
-        check = ttk.Checkbutton(frame, variable=var, style='Dark.TCheckbutton')
+        check = ToggleSwitch(frame, text=label_text, variable=var)  # Use ToggleSwitch class
         check.grid(column=1, row=row, sticky=tk.W, padx=5)
+        return (label, check, var)  # Return both the label and the checkbutton, and the variable
     elif var_type == 'combo':
         var = tk.StringVar(value=default_value)  # Set default value
-        combo = ttk.Combobox(frame, textvariable=var, values=options, style='TCombobox')  # Assuming you have a dark mode style for comboboxes
+        combo = ttk.Combobox(frame, textvariable=var, values=options, style='TCombobox')  # Apply TCombobox style
         combo.grid(column=1, row=row, sticky=tk.EW, padx=5)
         if default_value:
             combo.set(default_value)
+        return (label, combo, var)  # Return both the label and the combobox, and the variable
     else:
         var = None  # Placeholder in case of an undefined var_type
-    
-    return var
-    
+        return (label, None, var)
+
 def mask_variables():
     variables = {
         'src': ('entry', None, '/mnt/data/CellVoyager/40x/einar/mitotrackerHeLaToxoDsRed_20240224_123156/test_gui'),
@@ -473,7 +702,8 @@ def generate_fields(variables, scrollable_frame):
     vars_dict = {}
     row = 0
     for key, (var_type, options, default_value) in variables.items():
-        vars_dict[key] = create_input_field(scrollable_frame.scrollable_frame, key, row, var_type, options, default_value)
+        label, widget, var = create_input_field(scrollable_frame.scrollable_frame, key, row, var_type, options, default_value)
+        vars_dict[key] = (label, widget, var)  # Store the label, widget, and variable
         row += 1
     return vars_dict
     
@@ -489,7 +719,7 @@ class TextRedirector(object):
         pass
 
 def create_dark_mode(root, style, console_output):
-    dark_bg = '#333333'
+    dark_bg = 'black'
     light_text = 'white'
     dark_text = 'black'
     input_bg = '#555555'  # Slightly lighter background for input fields
@@ -505,14 +735,14 @@ def create_dark_mode(root, style, console_output):
     style.map('TCombobox', fieldbackground=[('readonly', input_bg)], selectbackground=[('readonly', input_bg)], foreground=[('readonly', dark_text)])
     
     if console_output != None:
-        console_output.config(bg=dark_bg, fg=light_text, insertbackground=light_text) #, font=("Arial", 12)
+        console_output.config(bg=dark_bg, fg=light_text, insertbackground=light_text) #, font=("Open Sans", 12)
     root.configure(bg=dark_bg)
     
 def set_dark_style(style):
-    style.configure('TFrame', background='#333333')
-    style.configure('TLabel', background='#333333', foreground='white')
-    style.configure('TEntry', background='#333333', foreground='white')
-    style.configure('TCheckbutton', background='#333333', foreground='white')
+    style.configure('TFrame', background='black')
+    style.configure('TLabel', background='black', foreground='white')
+    style.configure('TEntry', background='black', foreground='white')
+    style.configure('TCheckbutton', background='black', foreground='white')
 
 #@log_function_call   
 def main_thread_update_function(root, q, fig_queue, canvas_widget, progress_label):

spacr/io.py

@@ -1300,6 +1300,7 @@ def preprocess_img_data(settings):
     extension_counts = Counter(extensions)
     most_common_extension = extension_counts.most_common(1)[0][0]
     img_format = None
+    
 
     delete_empty_subdirectories(src)
 

spacr/mask_app.py

@@ -13,7 +13,7 @@ from ttkthemes import ThemedTk
 
 from .logger import log_function_call
 
-from .gui_utils import ScrollableFrame, set_dark_style, set_default_font, create_dark_mode
+from .gui_utils import ScrollableFrame, set_dark_style, set_default_font, create_dark_mode, style_text_boxes, create_menu_bar
 
 class modify_masks:
 
@@ -759,9 +759,12 @@ def initiate_mask_app_root(width, height):
     root = ThemedTk(theme=theme)
     style = ttk.Style(root)
     set_dark_style(style)
-    set_default_font(root, font_name="Arial", size=10)
+
+    style_text_boxes(style)
+    set_default_font(root, font_name="Arial", size=8)
     root.geometry(f"{width}x{height}")
     root.title("Mask App")
+    create_menu_bar(root)
 
     container = tk.PanedWindow(root, orient=tk.HORIZONTAL)
     container.pack(fill=tk.BOTH, expand=True)
@@ -806,7 +809,7 @@ def initiate_mask_app_root(width, height):
     create_dark_mode(root, style, console_output=None)
 
     run_button = ttk.Button(scrollable_frame.scrollable_frame, text="Run", command=run_app)
-    run_button.grid(row=row, column=0, columnspan=2, pady=10)
+    run_button.grid(row=row, column=0, columnspan=2, pady=10, padx=10)
 
     return root
 

spacr/utils.py

@@ -46,12 +46,6 @@ from torchvision.models.resnet import ResNet18_Weights, ResNet34_Weights, ResNet
 
 from .logger import log_function_call
 
-#from .io import _read_and_join_tables, _save_figure
-#from .timelapse import _btrack_track_cells, _trackpy_track_cells
-#from .plot import _plot_images_on_grid, plot_masks, _plot_histograms_and_stats, plot_resize, _plot_plates, _reg_v_plot, plot_masks
-#from .core import identify_masks
-
-
 def _gen_rgb_image(image, cahnnels):
     rgb_image = np.take(image, cahnnels, axis=-1)
     rgb_image = rgb_image.astype(float)

{spacr-0.0.21.dist-info → spacr-0.0.35.dist-info}/METADATA

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

{spacr-0.0.21.dist-info → spacr-0.0.35.dist-info}/RECORD

@@ -1,21 +1,23 @@
 spacr/__init__.py,sha256=mDi-Qu5r1vZnqIbUBV1JAoSq-mxmMEOmni1JSG2e4Wo,879
 spacr/__main__.py,sha256=_qRkhbFrH_cXr7AZs6KHL8Hh4VApqNdpNCtiKn2ePTo,285
 spacr/alpha.py,sha256=1LUtTaeVHqcTMxoCMA7mlsNYyaR0KEaXglwXsUQLwKo,13776
-spacr/annotate_app.py,sha256=jtm1HgWngv9BTsyVzdmBqg1flbmbXs9JkP6CB4wmOH8,19951
+spacr/annotate_app.py,sha256=8ziG6HZ6Kvany2yYDR15jtW84OnPFe8SZXykIrrNfX0,20031
+spacr/chris.py,sha256=YlBjSgeZaY8HPy6jkrT_ISAnCMAKVfvCxF0I9eAZLFM,2418
 spacr/cli.py,sha256=507jfOOEV8BoL4eeUcblvH-iiDHdBrEVJLu1ghAAPSc,1800
 spacr/core.py,sha256=_R8gXNnjf680yrnbCi2piWQUz7PDbqWYn7SL5MACLfo,156457
 spacr/foldseek.py,sha256=cWtLzvFF2O_mq5I71UMiuU9DTvDCp7wl6aaWAZRrBZc,33970
 spacr/get_alfafold_structures.py,sha256=n0g8gne-oyAV3Uo6qxZoJq5X1cUUyD8u0pOC_W2PX40,3541
 spacr/graph_learning.py,sha256=sD4eOC7Q16rr7WO20mCi_E16_LqioGUUgPamAHIIeNI,12568
 spacr/graph_learning_lap.py,sha256=MyNRLb63gsjBlui-ByZ0anHugYulL6M-OsGm8rnGBmE,3385
-spacr/gui_classify_app.py,sha256=-I06tVoA3U0jaAoTs32H1Y5ACMz6QBaEM1NEfg5w-9c,7965
-spacr/gui_mask_app.py,sha256=wb1w_-U1RTJFfRCGfdrkku4FVULSA_2gFZyVM9oQlB0,8752
-spacr/gui_measure_app.py,sha256=9mAw3Tiuq61uKTzMVslr0MgD8m1Lv5PNI0K4-gQiuXE,8061
+spacr/gui.py,sha256=2d2JHYVWhEFUkB3u_2OarCV_V07eLtJKUMKVKuJ7nAo,6430
+spacr/gui_classify_app.py,sha256=RqVC5Ac0GiFhKg1qUyU-xfbSVMwSTjySkReWCvmsZ1U,7917
+spacr/gui_mask_app.py,sha256=c0NwgzzMSYx7xE60sp6zLE1h7ct3pnT7n7gz1SqmWbs,9750
+spacr/gui_measure_app.py,sha256=I6OXPJZZ0sG3OqRO4l7Fr9Sb_5jr6X1Y2LXLgPW_Q_4,9675
 spacr/gui_sim_app.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spacr/gui_utils.py,sha256=NlgGFt62yqYnusv4yT1yjPcjd-v29N4IYukkJkEdL28,30493
-spacr/io.py,sha256=gcQJ-WOzwDzRZsIzzIoMKIbhFN5AP9lYy2HCv9fG8CU,108683
+spacr/gui_utils.py,sha256=URyEUfDn7RSE8iWBDwmC1jXWNA2Vl1oA2GsSjbSbuFU,40715
+spacr/io.py,sha256=-Ho1Rw46s5DfutcTAtp0RhEs3I-GPgXIphOpjJHutPU,108688
 spacr/logger.py,sha256=7Zqr3TuuOQLWT32gYr2q1qvv7x0a2JhLANmZcnBXAW8,670
-spacr/mask_app.py,sha256=B6-zYXVFg-cc58gLcz-Ry6LClO2jxLitL6B2ACb0HTw,39278
+spacr/mask_app.py,sha256=p9oA0JH0Rcly2Fbsrg-Vye_iThRCZZF9axU6hkE3SAI,39376
 spacr/measure.py,sha256=_f6UDugw75rILEg0uo2-QsUGUvc4AQdrdHl-BPZk74I,54686
 spacr/old_code.py,sha256=KxljHpKNsV5EfX9ifN2xJTnUeqAhyabZyfDWd5THOOc,11226
 spacr/plot.py,sha256=VtDKTJ_zo8CAVC3ILuIN_wUP6197vq089wNZuom7T8g,61655
@@ -23,11 +25,11 @@ spacr/sim.py,sha256=2NR5hm--HVcYQnj1SCHoUCVbh_b2XUjjjfoAUIXFwnQ,72997
 spacr/timelapse.py,sha256=plPjR8nZ7_Q50VAvMvHK2TUE4F-vh7R23JnI6tSW02g,39661
 spacr/train.py,sha256=lp66dWYkiMMlgdYlMjAsJnkIZFWLizKB-xwyVnKgFBs,25904
 spacr/umap.py,sha256=4QSrQ16Og-Ijq-SwguMQT2f20UWz1LE5HQeSLmzSl8c,29370
-spacr/utils.py,sha256=r0BjycEXqr48m0xEW9o14bLPj62JNpmEUBaBwR817Bw,121205
+spacr/utils.py,sha256=D3WRf_0w0T6dZHh3BfwScGBQjorljgWW6CQUdM0ToN8,120918
 spacr/version.py,sha256=axH5tnGwtgSnJHb5IDhiu4Zjk5GhLyAEDRe-rnaoFOA,409
-spacr-0.0.21.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
-spacr-0.0.21.dist-info/METADATA,sha256=u93xu8dbff0h_8p25GP5yi49sUOh7GS-axPRbik4qRk,4973
-spacr-0.0.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-spacr-0.0.21.dist-info/entry_points.txt,sha256=5uyJaAxWCbjWYwP15InAKU1yFxTwyuvCGtIGceso1es,290
-spacr-0.0.21.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
-spacr-0.0.21.dist-info/RECORD,,
+spacr-0.0.35.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
+spacr-0.0.35.dist-info/METADATA,sha256=0iEqhFIza7SaHVeYbl0Rc8WocPgGEVtiwMoWsIBBZzQ,4973
+spacr-0.0.35.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+spacr-0.0.35.dist-info/entry_points.txt,sha256=_khj_UcegrI5N29QcgxECsxVsfpVQzG3U5OUoKdtTcw,288
+spacr-0.0.35.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
+spacr-0.0.35.dist-info/RECORD,,

spacr-0.0.35.dist-info/entry_points.txt

@@ -0,0 +1,8 @@
+[console_scripts]
+annotate = spacr.annotate_app:gui_annotation
+classify = spacr.gui_classify_app:gui_classify
+gui = spacr.gui:gui_app
+make_masks = spacr.mask_app:gui_make_masks
+mask = spacr.gui_mask_app:gui_mask
+measure = spacr.gui_measure_app:gui_measure
+sim = spacr.gui_sim_app:gui_sim

spacr-0.0.21.dist-info/entry_points.txt

@@ -1,7 +0,0 @@
-[console_scripts]
-gui_annotation = spacr.annotate_app:gui_annotation
-gui_classify = spacr.gui_classify_app:gui_classify
-gui_make_masks = spacr.mask_app:gui_make_masks
-gui_mask = spacr.gui_mask_app:gui_mask
-gui_measure = spacr.gui_measure_app:gui_measure
-gui_sim = spacr.gui_sim_app:gui_sim