spacr 0.3.31__py3-none-any.whl → 0.3.32__py3-none-any.whl

spacr/app_annotate.py

@@ -3,8 +3,25 @@ from tkinter import ttk
 from .gui import MainApp
 from .gui_elements import set_dark_style, spacrButton
 
+def convert_to_number(value):
+    
+    """
+    Converts a string value to an integer if possible, otherwise converts to a float.
+    Args:
+        value (str): The string representation of the number.
+    Returns:
+        int or float: The converted number.
+    """
+    try:
+        return int(value)
+    except ValueError:
+        try:
+            return float(value)
+        except ValueError:
+            raise ValueError(f"Unable to convert '{value}' to an integer or float.")
+
 def initiate_annotation_app(parent_frame):
-    from .gui_utils import generate_annotate_fields, annotate_app
+    from .gui_utils import generate_annotate_fields, annotate_app, convert_to_number
     # Set up the settings window
     settings_window = tk.Toplevel(parent_frame)
     settings_window.title("Annotation Settings")
@@ -18,7 +35,7 @@ def initiate_annotation_app(parent_frame):
         settings = {key: data['entry'].get() for key, data in vars_dict.items()}
         settings['channels'] = settings['channels'].split(',')
         settings['img_size'] = list(map(int, settings['img_size'].split(',')))  # Convert string to list of integers
-        settings['percentiles'] = list(map(int, settings['percentiles'].split(',')))  # Convert string to list of integers
+        settings['percentiles'] = list(map(convert_to_number, settings['percentiles'].split(','))) if settings['percentiles'] else [2, 98]
         settings['normalize'] = settings['normalize'].lower() == 'true'
         settings['normalize_channels'] = settings['normalize_channels'].split(',')
         try:

spacr/gui_utils.py

@@ -320,7 +320,6 @@ def annotate_app(parent_frame, settings):
     global global_image_refs
     global_image_refs.clear()
     root = parent_frame.winfo_toplevel()
-    print('annotate_app',settings)
     annotate_with_image_refs(settings, root, lambda: load_next_app(root))
 
 def load_next_app(root):
@@ -1026,4 +1025,21 @@ def get_screen_dimensions():
     monitor = get_monitors()[0]  # Get the primary monitor
     screen_width = monitor.width
     screen_height = monitor.height
-    return screen_width, screen_height
+    return screen_width, screen_height
+
+def convert_to_number(value):
+    
+    """
+    Converts a string value to an integer if possible, otherwise converts to a float.
+    Args:
+        value (str): The string representation of the number.
+    Returns:
+        int or float: The converted number.
+    """
+    try:
+        return int(value)
+    except ValueError:
+        try:
+            return float(value)
+        except ValueError:
+            raise ValueError(f"Unable to convert '{value}' to an integer or float.")

{spacr-0.3.31.dist-info → spacr-0.3.32.dist-info}/METADATA

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

{spacr-0.3.31.dist-info → spacr-0.3.32.dist-info}/RECORD

@@ -1,6 +1,6 @@
 spacr/__init__.py,sha256=3TNo4PgxHZTHOhyPc8AORvG3tzdPFEc30KAtsOou174,1618
 spacr/__main__.py,sha256=bkAJJD2kjIqOP-u1kLvct9jQQCeUXzlEjdgitwi1Lm8,75
-spacr/app_annotate.py,sha256=XxGpapg71099aVjb5ZEqgpKTBc_1OIb6_y8yzWfqrsM,2252
+spacr/app_annotate.py,sha256=zGmAJplDOckhaUZijkHgbFH9LJNbd6TolU2hamplOBc,2769
 spacr/app_classify.py,sha256=urTP_wlZ58hSyM5a19slYlBxN0PdC-9-ga0hvq8CGWc,165
 spacr/app_make_masks.py,sha256=pqDhRpluiHZz-kPX2Zh_KbYe4TsU43qYBa_7f-rsjpw,1694
 spacr/app_mask.py,sha256=l-dBY8ftzCMdDe6-pXc2Nh_u-idNL9G7UOARiLJBtds,153
@@ -13,7 +13,7 @@ spacr/deep_spacr.py,sha256=HdOcNU8cHcE_19nP7_5uTz-ih3E169ffr2Hm--NvMvA,43255
 spacr/gui.py,sha256=ARyn9Q_g8HoP-cXh1nzMLVFCKqthY4v2u9yORyaQqQE,8230
 spacr/gui_core.py,sha256=LV_HX5zreu3Bye6sQFDbOuk8Dfj4StMoohy6hsrDEXA,41363
 spacr/gui_elements.py,sha256=puDqf7PJJ_UMA01fjqODk-zsfSmvzVXpvaZ1BYV988w,136554
-spacr/gui_utils.py,sha256=TFY3zNyTk-FkJ0mjSrWsE2DpHWBbGuQoi1rh2AkXQyQ,45007
+spacr/gui_utils.py,sha256=cZ_EEr1SE1zJFLmYrDJB896u_reTL_FJbP6fSY5Xx6U,45454
 spacr/io.py,sha256=AARmqn1fMmTgVDwWy8bEYK6SjH-6DZIulgCSPdBTyf0,143370
 spacr/logger.py,sha256=lJhTqt-_wfAunCPl93xE65Wr9Y1oIHJWaZMjunHUeIw,1538
 spacr/measure.py,sha256=BThn_sALgKrwGKnLOGpT4FyoJeRVoTZoP9SXbCtCMRw,54857
@@ -150,9 +150,9 @@ spacr/resources/icons/umap.png,sha256=dOLF3DeLYy9k0nkUybiZMe1wzHQwLJFRmgccppw-8b
 spacr/resources/images/plate1_E01_T0001F001L01A01Z01C02.tif,sha256=Tl0ZUfZ_AYAbu0up_nO0tPRtF1BxXhWQ3T3pURBCCRo,7958528
 spacr/resources/images/plate1_E01_T0001F001L01A02Z01C01.tif,sha256=m8N-V71rA1TT4dFlENNg8s0Q0YEXXs8slIn7yObmZJQ,7958528
 spacr/resources/images/plate1_E01_T0001F001L01A03Z01C03.tif,sha256=Pbhk7xn-KUP6RSIhJsxQcrHFImBm3GEpLkzx7WOc-5M,7958528
-spacr-0.3.31.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
-spacr-0.3.31.dist-info/METADATA,sha256=-U4SqumPkRAW6fWg7hsKsgq7tTVPvwtH8um0ZEXca1c,5949
-spacr-0.3.31.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-spacr-0.3.31.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
-spacr-0.3.31.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
-spacr-0.3.31.dist-info/RECORD,,
+spacr-0.3.32.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
+spacr-0.3.32.dist-info/METADATA,sha256=zmqGrPPpr-pTpLbwPpCl0zwLA2oaZ1kGNo90t-nUF5g,5949
+spacr-0.3.32.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+spacr-0.3.32.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
+spacr-0.3.32.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
+spacr-0.3.32.dist-info/RECORD,,