spacr 0.1.55__tar.gz → 0.1.61__tar.gz

{spacr-0.1.55/spacr.egg-info → spacr-0.1.61}/PKG-INFO

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

{spacr-0.1.55 → spacr-0.1.61}/setup.py

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

{spacr-0.1.55 → spacr-0.1.61}/spacr/__init__.py

@@ -14,6 +14,10 @@ from . import timelapse
 from . import deep_spacr
 from . import app_annotate
 from . import gui_utils
+from . import gui_elements
+from . import gui_core
+from . import gui_run
+from . import gui_wrappers
 from . import app_make_masks
 from . import app_mask
 from . import app_measure
@@ -37,7 +41,6 @@ __all__ = [
     "app_annotate",
     "gui_utils",
     "app_make_masks",
-    "app_make_masks_v2",
     "app_mask",
     "app_measure",
     "app_classify",

{spacr-0.1.55 → spacr-0.1.61}/spacr/app_annotate.py

@@ -13,7 +13,7 @@ from IPython.display import display, HTML
 from tkinter import font as tkFont
 from tkinter import TclError
 
-from .gui_utils import spacrFrame, spacrButton, set_dark_style, create_menu_bar, set_default_font
+from .gui_elements import spacrFrame, spacrButton, set_dark_style, create_menu_bar, set_default_font
 
 class ImageApp:
     def __init__(self, root, db_path, src, image_type=None, channels=None, grid_rows=None, grid_cols=None, image_size=(200, 200), annotation_column='annotate', normalize=False, percentiles=(1,99), measurement=None, threshold=None):

{spacr-0.1.55 → spacr-0.1.61}/spacr/app_make_masks.py

@@ -9,11 +9,8 @@ from skimage.transform import resize
 from scipy.ndimage import binary_fill_holes, label
 import tkinter as tk
 from tkinter import ttk
-from ttkthemes import ThemedTk
 
-from .logger import log_function_call
-
-from .gui_utils import spacrFrame, spacrButton, set_dark_style, create_menu_bar, set_default_font
+from .gui_elements import spacrFrame, spacrButton, set_dark_style, create_menu_bar, set_default_font
 
 class modify_masks:
 

{spacr-0.1.55 → spacr-0.1.61}/spacr/core.py

@@ -1668,7 +1668,7 @@ def preprocess_generate_masks(src, settings={}):
 
     from .io import preprocess_img_data, _load_and_concatenate_arrays
     from .plot import plot_merged, plot_arrays
-    from .utils import _pivot_counts_table, check_mask_folder, adjust_cell_masks, _merge_cells_based_on_parasite_overlap, process_masks
+    from .utils import _pivot_counts_table, check_mask_folder, adjust_cell_masks
     from .settings import set_default_settings_preprocess_generate_masks, set_default_plot_merge_settings
     
     settings = set_default_settings_preprocess_generate_masks(src, settings)

{spacr-0.1.55 → spacr-0.1.61}/spacr/gui.py

@@ -1,10 +1,10 @@
 import tkinter as tk
 from tkinter import ttk
 from PIL import Image, ImageTk
-import os
-import requests
+import os, requests
 from multiprocessing import set_start_method
-from .gui_utils import set_dark_style, create_menu_bar, initiate_root, spacrButton
+from .gui_elements import spacrButton, create_menu_bar, set_dark_style
+from .gui_core import initiate_root
 from .app_annotate import initiate_annotation_app_root
 from .app_make_masks import initiate_mask_app_root