small-fish-gui 1.9.2__py3-none-any.whl → 1.9.3__py3-none-any.whl

small_fish_gui/README.md

@@ -1,3 +1,7 @@
+***INSTALATTION ISSUE : Currently the package cannot be installed due to a package deletion on pypi. I will migrate the code to a free, open source gui package and update the dependecies list***
+  
+  --> Requirements have been updated, pip installation is still not working but it is possible to install through git cloning
+
 # Small Fish
 **Small Fish** is a python application for the analysis of smFish images. It provides a ready to use graphical interface to combine famous python packages for cell analysis without any need for coding.
 
@@ -5,7 +9,7 @@ Cell segmentation (**2D**) is peformed using *cellpose* (published work) : https
 
 Spot detection is performed via *big-fish* (published work) : https://github.com/fish-quant/big-fish
 
-**Time stacks are not supported.**
+***Small Fish is bulding a [wiki](https://github.com/2Echoes/small_fish_gui/wiki) ! Make sure to check it out.***
 
 ## What can you do with small fish ?
 
@@ -93,5 +97,11 @@ Note that for training it is recommended to first set up your GPU as training co
 ## Developpement
 
 Optional features to include in future versions : 
+
+**Major Dev**
 - time stack (which would include cell tracking)
 - 3D segmentation
+
+**Minor features**
+- allows npz files with multiple masks in load segmentation by asking user which one to select
+- fix parquet format or replace to another compressed format

small_fish_gui/__init__.py

@@ -38,4 +38,4 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """
-__version__ = "1.9.2"
+__version__ = "1.9.3"

small_fish_gui/__main__.py

@@ -1,5 +1,5 @@
 import sys, subprocess
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 
 from small_fish_gui import __version__
 

small_fish_gui/batch/integrity.py

@@ -6,7 +6,7 @@ import os
 import czifile as czi
 import bigfish.stack as stack
 import numpy as np
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 
 from ..pipeline._preprocess import check_integrity, convert_parameters_types, ParameterInputError, _check_segmentation_parameters
 from ..pipeline.segmentation import _cast_segmentation_parameters

small_fish_gui/batch/pipeline.py

@@ -4,7 +4,7 @@ Submodule keeping necessary calls from main pipeline for batch processing.
 
 import os
 import pandas as pd
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 
 from ..hints import pipeline_parameters
 
@@ -57,172 +57,198 @@ def batch_pipeline(
     window_print(batch_window,"Launching batch analysis...")
     batch_progress_bar.update(max=len(filenames_list))
     filenames_list.sort()
+    
+
+    error_log = open(main_dir + "error_log", mode='w')
+    error_count = 0
+
     for acquisition_id, file in enumerate(filenames_list) :
-        
-        #GUI
-        window_print(batch_window,"\nNext file : {0}".format(file))
-        batch_progress_bar.update(current_count= acquisition_id, max= len(filenames_list))
-        progress_count.update(value=str(acquisition_id))
-        batch_window = batch_window.refresh()
-        
-        #0. Open image
-        image = open_image(input_path + '/' + file)
-        parameters['image'] = image
-        parameters['filename'] = file
-        for key_to_clean in [0,2] : 
-            if key_to_clean in parameters : del parameters[key_to_clean]
-
-        #1. Re-order shape
-        shape = image.shape
-        parameters['shape'] = shape
-        parameters['reordered_shape'] = reorder_shape(shape, map_=map_)
-
-        #2. Segmentation (opt)
-        if do_segmentation :
-            window_print(batch_window,"Segmenting cells...")
-            im_seg = reorder_image_stack(map_, image)
-            parameters = _cast_segmentation_parameters(parameters)
-            cytoplasm_label, nucleus_label = cell_segmentation(
-                im_seg,
-                cyto_model_name= parameters['cyto_model_name'],
-                cyto_diameter= parameters['cytoplasm diameter'],
-                nucleus_model_name= parameters['nucleus_model_name'],
-                nucleus_diameter= parameters['nucleus diameter'],
-                channels=[parameters['cytoplasm channel'], parameters['nucleus channel']],
-                do_only_nuc=parameters['Segment only nuclei']
-                )
-            
-            parameters['segmentation_done'] = True
-
-            if cytoplasm_label.max() == 0 : #No cell segmented
-                window_print(batch_window,"No cell was segmented, computing next image.")
-                continue
-            else : 
-                window_print(batch_window, "{0} cells segmented.".format(cytoplasm_label.max()))
-
-                if parameters['save segmentation'] :
-                    plot_segmentation(
-                        cyto_image=im_seg[parameters['cytoplasm channel']],
-                        cyto_label= cytoplasm_label,
-                        nuc_image= im_seg[parameters['nucleus channel']],
-                        nuc_label=nucleus_label,
-                        path= main_dir + "segmentation/" + file,
-                        do_only_nuc= parameters['Segment only nuclei'],
+        try :
+
+            #GUI
+            window_print(batch_window,"\nNext file : {0}".format(file))
+            batch_progress_bar.update(current_count= acquisition_id, max= len(filenames_list))
+            progress_count.update(value=str(acquisition_id))
+            batch_window = batch_window.refresh()
+
+            #0. Open image
+            image = open_image(input_path + '/' + file)
+            parameters['image'] = image
+            parameters['filename'] = file
+            for key_to_clean in [0,2] : 
+                if key_to_clean in parameters : del parameters[key_to_clean]
+
+            #1. Re-order shape
+            shape = image.shape
+            parameters['shape'] = shape
+            parameters['reordered_shape'] = reorder_shape(shape, map_=map_)
+
+            #2. Segmentation (opt)
+            if do_segmentation :
+                window_print(batch_window,"Segmenting cells...")
+                im_seg = reorder_image_stack(map_, image)
+                parameters = _cast_segmentation_parameters(parameters)
+                cytoplasm_label, nucleus_label = cell_segmentation(
+                    im_seg,
+                    cyto_model_name= parameters['cyto_model_name'],
+                    cyto_diameter= parameters['cytoplasm diameter'],
+                    nucleus_model_name= parameters['nucleus_model_name'],
+                    nucleus_diameter= parameters['nucleus diameter'],
+                    channels=[parameters['cytoplasm channel'], parameters['nucleus channel']],
+                    do_only_nuc=parameters['Segment only nuclei']
                     )
 
-        else :
-            cytoplasm_label, nucleus_label = None,None
-            parameters['segmentation_done'] = False
-
-        #3. Detection, deconvolution, clusterisation
-        window_print(batch_window,"Detecting spots...")
-        parameters = convert_parameters_types(parameters)
-        image, other_image = prepare_image_detection(map_, parameters) 
-        nucleus_signal = get_nucleus_signal(image, other_image, parameters)
-        try : # Catch error raised if user enter a spot size too small compare to voxel size
-            parameters, frame_result, spots, clusters, spot_cluster_id = launch_detection(
-                image,
-                other_image,
-                parameters,
-                cell_label=cytoplasm_label,
-                nucleus_label=nucleus_label,
-                hide_loading=True,
-            )
+                parameters['segmentation_done'] = True
+
+                if cytoplasm_label.max() == 0 : #No cell segmented
+                    window_print(batch_window,"No cell was segmented, computing next image.")
+                    continue
+                else : 
+                    window_print(batch_window, "{0} cells segmented.".format(cytoplasm_label.max()))
+
+                    if parameters['save segmentation'] :
+                        plot_segmentation(
+                            cyto_image=im_seg[parameters['cytoplasm channel']],
+                            cyto_label= cytoplasm_label,
+                            nuc_image= im_seg[parameters['nucleus channel']],
+                            nuc_label=nucleus_label,
+                            path= main_dir + "segmentation/" + file,
+                            do_only_nuc= parameters['Segment only nuclei'],
+                        )
 
-        except ValueError as error :
-            if "The array should have an upper bound of 1" in str(error) :
-                window_print(batch_window,"Spot size too small for current voxel size.")
-                continue
             else :
-                raise(error)
-        
-        if parameters['save detection'] :
-            if parameters['do_cluster_computation'] : 
-                if len(clusters) > 0 :
-                    spots_list = [spots, clusters[:,:-2]]
-                else : spots_list = [spots]
-            else : spots_list = [spots]
-            output_spot_tiffvisual(
-                image,
-                spots_list= spots_list,
-                dot_size=2,
-                path_output= main_dir + "detection/" + file + "_spot_detection.tiff"
-            )
+                cytoplasm_label, nucleus_label = None,None
+                parameters['segmentation_done'] = False
+
+            #3. Detection, deconvolution, clusterisation
+            window_print(batch_window,"Detecting spots...")
+            parameters = convert_parameters_types(parameters)
+            image, other_image = prepare_image_detection(map_, parameters) 
+            nucleus_signal = get_nucleus_signal(image, other_image, parameters)
+            try : # Catch error raised if user enter a spot size too small compare to voxel size
+                parameters, frame_result, spots, clusters, spot_cluster_id = launch_detection(
+                    image,
+                    other_image,
+                    parameters,
+                    cell_label=cytoplasm_label,
+                    nucleus_label=nucleus_label,
+                    hide_loading=True,
+                )
 
-        #4. Spots extraction
-        window_print(batch_window,"Extracting spots : ")
-        if parameters['extract spots'] :
-
-            #Setting parameter for call to lauch spot extraction
-            #Only spots have one file per image to avoir memory overload
-            parameters['do_spots_excel'] = parameters['xlsx']
-            parameters['do_spots_csv'] = parameters['csv']
-            parameters['do_spots_feather'] = parameters['feather']
-            parameters['spots_filename'] = "spots_extractions_{0}".format(file)
-            parameters['spots_extraction_folder'] = main_dir + "results/spots_extraction/"
-
-            launch_spots_extraction(
-                    acquisition_id=acquisition_id + last_acquisition_id,
-                    user_parameters=parameters,
-                    image=image,
-                    spots=spots,
-                    cluster_id=spot_cluster_id,
-                    nucleus_label= nucleus_label,
-                    cell_label= cytoplasm_label,
+            except ValueError as error :
+                if "The array should have an upper bound of 1" in str(error) :
+                    window_print(batch_window,"Spot size too small for current voxel size.")
+                    continue
+                else :
+                    raise(error)
+
+            if parameters['save detection'] :
+                if parameters['do_cluster_computation'] : 
+                    if len(clusters) > 0 :
+                        spots_list = [spots, clusters[:,:-2]]
+                    else : spots_list = [spots]
+                else : spots_list = [spots]
+                output_spot_tiffvisual(
+                    image,
+                    spots_list= spots_list,
+                    dot_size=2,
+                    path_output= main_dir + "detection/" + file + "_spot_detection.tiff"
                 )
 
-        #5. Features computation
-        window_print(batch_window,"computing features...")
-        new_results_df, new_cell_results_df = launch_features_computation(
-        acquisition_id=acquisition_id + last_acquisition_id,
-        image=image,
-        nucleus_signal = nucleus_signal,
-        spots=spots,
-        clusters=clusters,
-        spots_cluster_id=spot_cluster_id,
-        nucleus_label = nucleus_label,
-        cell_label= cytoplasm_label,
-        user_parameters=parameters,
-        frame_results=frame_result,
-        )
-
-        results_df = pd.concat([
-            results_df.reset_index(drop=True), new_results_df.reset_index(drop=True)
-        ], axis=0)
-
-        cell_results_df = pd.concat([
-            cell_results_df.reset_index(drop=True), new_cell_results_df.reset_index(drop=True)
-        ], axis=0)
-
-
-        #6. Saving results
-        window_print(batch_window,"saving image_results...")
-        #1 file per batch + 1 file per batch if segmentation
-        acquisition_success = write_results(
-            results_df, 
-            path= main_dir + "results/", 
-            filename=batch_name, 
-            do_excel= parameters["xlsx"], 
-            do_feather= parameters["feather"], 
-            do_csv= parameters["csv"],
-            overwrite=True,
+            #4. Spots extraction
+            window_print(batch_window,"Extracting spots : ")
+            if parameters['extract spots'] :
+
+                #Setting parameter for call to lauch spot extraction
+                #Only spots have one file per image to avoir memory overload
+                parameters['do_spots_excel'] = parameters['xlsx']
+                parameters['do_spots_csv'] = parameters['csv']
+                parameters['do_spots_feather'] = parameters['feather']
+                parameters['spots_filename'] = "spots_extractions_{0}".format(file)
+                parameters['spots_extraction_folder'] = main_dir + "results/spots_extraction/"
+
+                launch_spots_extraction(
+                        acquisition_id=acquisition_id + last_acquisition_id,
+                        user_parameters=parameters,
+                        image=image,
+                        spots=spots,
+                        cluster_id=spot_cluster_id,
+                        nucleus_label= nucleus_label,
+                        cell_label= cytoplasm_label,
+                    )
+
+            #5. Features computation
+            window_print(batch_window,"computing features...")
+            new_results_df, new_cell_results_df = launch_features_computation(
+            acquisition_id=acquisition_id + last_acquisition_id,
+            image=image,
+            nucleus_signal = nucleus_signal,
+            spots=spots,
+            clusters=clusters,
+            spots_cluster_id=spot_cluster_id,
+            nucleus_label = nucleus_label,
+            cell_label= cytoplasm_label,
+            user_parameters=parameters,
+            frame_results=frame_result,
             )
-        
-        if do_segmentation :
-            cell_success = write_results(
-                cell_results_df, 
+
+            results_df = pd.concat([
+                results_df.reset_index(drop=True), new_results_df.reset_index(drop=True)
+            ], axis=0)
+
+            cell_results_df = pd.concat([
+                cell_results_df.reset_index(drop=True), new_cell_results_df.reset_index(drop=True)
+            ], axis=0)
+
+
+            #6. Saving results
+            window_print(batch_window,"saving image_results...")
+            #1 file per batch + 1 file per batch if segmentation
+            acquisition_success = write_results(
+                results_df, 
                 path= main_dir + "results/", 
-                filename=batch_name + '_cell_result', 
+                filename=batch_name, 
                 do_excel= parameters["xlsx"], 
                 do_feather= parameters["feather"], 
                 do_csv= parameters["csv"],
                 overwrite=True,
                 )
-        
-        window_print(batch_window,"Sucessfully saved.")
 
+            if do_segmentation :
+                cell_success = write_results(
+                    cell_results_df, 
+                    path= main_dir + "results/", 
+                    filename=batch_name + '_cell_result', 
+                    do_excel= parameters["xlsx"], 
+                    do_feather= parameters["feather"], 
+                    do_csv= parameters["csv"],
+                    overwrite=True,
+                    )
+
+            window_print(batch_window,"Sucessfully saved.")
+
+        except Exception as error :
+            
+            error_count +=1
+            print("Exception raised for acquisition, writting error in error log.")
+
+            log = [
+                f"Error raised during acquisition {acquisition_id}.\n"
+            ]
+            log.append(str(error) + '\n')
+
+            error_log.writelines(log)
+
+            print("Ignoring current acquisition and proceeding to next one.")
+            continue
+
+    
         
     batch_progress_bar.update(current_count= acquisition_id+1, max= len(filenames_list))
     progress_count.update(value=str(acquisition_id+1))
     batch_window = batch_window.refresh()
+
+    if error_count > 0 :
+        sg.popup(f"Batch processing finished but {error_count} acquisitions were skipped during quantification.\nFor more informations check error_log in result folder.")
+
     return results_df, cell_results_df, acquisition_id

small_fish_gui/batch/prompt.py

@@ -3,7 +3,7 @@ Submodule with main function to call to launch batch mode.
 """
 
 import os
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 
 from .utils import get_elmt_from_key, create_map, call_auto_map
 from .pipeline import batch_pipeline

small_fish_gui/batch/test.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import small_fish_gui.batch as batch
 import pandas as pd
 

small_fish_gui/batch/update.py

@@ -1,7 +1,7 @@
 """
 Functions handling GUI update while user is interacting with software.
 """
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 
 from .utils import get_elmt_from_key
 

small_fish_gui/batch/utils.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 from ..pipeline._preprocess import _auto_map_channels
 from ..pipeline._preprocess import MappingError
 

small_fish_gui/gui/animation.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import numpy as np
 
 WAITING_TEXT = [

small_fish_gui/gui/help_module.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import os
 
 

small_fish_gui/gui/layout.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import os
 from ..utils import check_parameter
 import cellpose.models as models

small_fish_gui/gui/napari_visualiser.py

@@ -198,7 +198,7 @@ def correct_spots(
         if len(clusters) > 0 :
             clusters_coordinates = clusters[:, :dim]
         else :
-            clusters_coordinates = np.empty(shape=(0,3), dtype=int) 
+            clusters_coordinates = np.empty(shape=(0,dim), dtype=int) 
         Viewer.add_points( # cluster; this layer can be update by user.
             clusters_coordinates, 
             size = 10, 
@@ -222,8 +222,8 @@ def correct_spots(
     if type(clusters) != type(None) :
         new_clusters = np.round(Viewer.layers['foci'].data).astype(int)
         if len(new_clusters) == 0 :
-            new_clusters = np.empty(shape=(0,5), dtype=int)
-            new_cluster_id = -1 * np.ones(len(new_spots))
+            new_clusters = np.empty(shape=(0,dim + 2), dtype=int)
+            new_cluster_id = -1 * np.ones(shape=(len(new_spots), 1), dtype=int)
             new_spots = np.concatenate([new_spots, new_cluster_id], axis=1)
         else :
             new_cluster_id = Viewer.layers['foci'].features.to_numpy()

small_fish_gui/gui/prompts.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import pandas as pd
 import os
 import numpy as np

small_fish_gui/interface/inoutput.py

@@ -4,7 +4,7 @@ import numpy as np
 from bigfish.stack import check_parameter
 from typing import Literal
 
-MAX_LEN_EXCEL = 1048576
+MAX_LEN_EXCEL = 1048576 #Maximum number of lines that can be written in an excel file
 
 def _cast_spot_to_tuple(spot) :
     return tuple([coord for coord in spot])
@@ -120,10 +120,21 @@ def input_segmentation(
         nucleus_path : str,
         cytoplasm_path : str,
 ) :
-    nucleus_label = np.load(nucleus_path)
+    
+    if nucleus_path.endswith('.npy') or nucleus_path.endswith('.npz') :
+        nucleus_label = np.load(nucleus_path)
+    else :
+        raise ValueError("Wrong extension for mask file, only npy and npz are supported")
+
 
     if cytoplasm_path != '' :
-        cytoplasm_label = np.load(cytoplasm_path)
+
+        if cytoplasm_path.endswith('.npy') or cytoplasm_path.endswith('.npz') :
+            cytoplasm_label = np.load(cytoplasm_path)
+        else :
+            raise ValueError("Wrong extension for mask file, only npy and npz are supported")
+
+
     else : 
         cytoplasm_label = nucleus_label
 

small_fish_gui/interface/testing.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 
 layout = [
     [sg.Radio(['A',], key='button', group_id=0, key='test1'),sg.Radio(['B'], key='button', group_id=0, key='test2'), sg.Radio(['C'], key='button', group_id=0, key='test3')],

small_fish_gui/pipeline/_colocalisation.py

@@ -3,7 +3,7 @@ from ..gui import coloc_prompt, add_default_loading
 
 import numpy as np
 import pandas as pd
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 from scipy.ndimage import distance_transform_edt
 from scipy.signal import fftconvolve
 
@@ -413,7 +413,8 @@ def _cell_coloc(
     colocalisation_df = colocalisation_df.drop('rna_coords', axis=1)
     colocalisation_df['voxel_size'] = [voxel_size]*len(colocalisation_df)
     colocalisation_df['pair_name'] = [(acquisition_name_id1, acquisition_name_id2)] * len(colocalisation_df)
-    colocalisation_df['pair_acquisition_id'] = [(acquisition_id1, acquisition_id2)] * len(colocalisation_df)
+    colocalisation_df['acquisition_id_1'] = [acquisition_id1] * len(colocalisation_df)
+    colocalisation_df['acquisition_id_2'] = [acquisition_id2] * len(colocalisation_df)
     colocalisation_df['colocalisation_distance'] = colocalisation_distance
 
     return colocalisation_df

small_fish_gui/pipeline/_preprocess.py

@@ -1,6 +1,6 @@
 import numpy as np
 import os
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 from ..gui import _error_popup, _warning_popup, parameters_layout, add_header, prompt, prompt_with_help
 from ..gui.prompts import input_image_prompt
 

small_fish_gui/pipeline/actions.py

@@ -25,7 +25,7 @@ from ..hints import pipeline_parameters
 
 import os
 import pandas as pd
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import numpy as np
 
 def segment_cells(user_parameters : pipeline_parameters, nucleus_label, cytoplasm_label) :
@@ -76,6 +76,7 @@ def add_detection(user_parameters : pipeline_parameters, acquisition_id, cytopla
         if type(detection_parameters) != type(None) :
             user_parameters.update(detection_parameters) 
         else : #If user clicks cancel
+            
             cancel = ask_cancel_detection()
             if cancel : 
                 return new_results_df, new_cell_results_df, acquisition_id, user_parameters
@@ -201,13 +202,22 @@ def load_segmentation(nucleus_label, cytoplasm_label, segmentation_done) :
         else :
             return nucleus_label, cytoplasm_label, segmentation_done
 
-    answer = prompt_load_segmentation()
-    if type(answer) == type(None) : #user clicks cancel
-        return nucleus_label, cytoplasm_label, segmentation_done
-    nucleus_label, cytoplasm_label = input_segmentation(
-        answer['nucleus'],
-        answer['cytoplasm'],
-    )
+    while True :
+        answer = prompt_load_segmentation()
+
+        if type(answer) == type(None) : #user clicks cancel
+            return nucleus_label, cytoplasm_label, segmentation_done
+
+        try :
+            nucleus_label, cytoplasm_label = input_segmentation(
+                answer['nucleus'],
+                answer['cytoplasm'],
+            )
+        
+        except ValueError as e :
+            sg.popup(str(e))
+        else :
+            break
 
     if type(nucleus_label) != type(None) and type(nucleus_label) != np.ndarray :
         nucleus_label = nucleus_label['arr_0']

small_fish_gui/pipeline/detection.py

@@ -19,7 +19,7 @@ from napari.types import LayerDataTuple
 
 import numpy as np
 import pandas as pd
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 from numpy import NaN
 import bigfish.detection as detection
 import bigfish.stack as stack
@@ -220,7 +220,7 @@ def initiate_detection(user_parameters : pipeline_parameters, map_, shape) :
             segmentation_done= user_parameters['segmentation_done'],
             default_dict=detection_parameters
             )
-        if type(detection_parameters) == type(None) : return user_parameters
+        if type(detection_parameters) == type(None) : return None
         try :
             detection_parameters = convert_parameters_types(detection_parameters)
             detection_parameters = check_integrity(
@@ -710,7 +710,14 @@ def launch_features_computation(
     if user_parameters['segmentation_done'] : 
         cell_result_dframe['name'] = name
         cell_result_dframe = cell_result_dframe.loc[:,['name'] + cell_result_col]
-        cell_result_dframe['total_rna_number'] = cell_result_dframe['nb_rna_in_nuc'] + cell_result_dframe['nb_rna_out_nuc']
+        if 'nb_rna_in_nuc' in cell_result_dframe.columns and 'nb_rna_out_nuc' in cell_result_dframe.columns :
+            cell_result_dframe['total_rna_number'] = cell_result_dframe['nb_rna_in_nuc'] + cell_result_dframe['nb_rna_out_nuc']
+        else : # This can happen when segmentation is performed and detects cells but they are on fov edges and thus removed by big-fish.
+            print("\033[1;31m All segmented cells where skipped because they are found on fov edges (incomplete cells), if you want to analyse this image check segmentation.\033[00m")
+            cell_result_dframe['nb_rna_in_nuc'] = np.NaN
+            cell_result_dframe['nb_rna_out_nuc'] = np.NaN
+            cell_result_dframe['total_rna_number'] = np.NaN
+
         
     return frame_results, cell_result_dframe
 

small_fish_gui/pipeline/main.py

@@ -3,7 +3,7 @@ This script is called when software starts; it is the main loop.
 """
 
 import pandas as pd
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 from ..gui import hub_prompt
 from .actions import add_detection, save_results, compute_colocalisation, delete_acquisitions, rename_acquisitions, save_segmentation, load_segmentation, segment_cells
 from ._preprocess import clean_unused_parameters_cache

small_fish_gui/pipeline/segmentation.py

@@ -20,7 +20,7 @@ import numpy as np
 import bigfish.multistack as multistack
 import bigfish.stack as stack
 import bigfish.plot as plot
-import PySimpleGUI as sg
+import FreeSimpleGUI as sg
 import matplotlib.pyplot as plt
 import os
 

small_fish_gui/pipeline/testing.ipynb

@@ -2045,7 +2045,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "cellpose",
+   "display_name": "small_fish",
    "language": "python",
    "name": "python3"
   },
@@ -2059,7 +2059,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.16"
+   "version": "3.8.19"
   }
  },
  "nbformat": 4,

small_fish_gui/requirements.txt

@@ -9,7 +9,7 @@ napari-plugin-manager==0.1.0a2
 napari-svg==0.1.10
 numpy==1.24.4
 pandas==1.5.3
-PySimpleGUI==4.60.5
+FreeSimpleGUI==5.1.1
 scipy==1.9.1
 scikit-image==0.19.1
 scikit-learn==1.3.2

{small_fish_gui-1.9.2.dist-info → small_fish_gui-1.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: small_fish_gui
-Version: 1.9.2
+Version: 1.9.3
 Summary: Small Fish is a python application for the analysis of smFish images. It provides a ready to use graphical interface to combine famous python packages for cell analysis without any need for coding.
 Project-URL: Homepage, https://github.com/2Echoes/small_fish
 Project-URL: Issues, https://github.com/2Echoes/small_fish/issues
@@ -13,6 +13,7 @@ Requires-Python: >=3.8
 Requires-Dist: big-fish==0.6.2
 Requires-Dist: cellpose==3.0.7
 Requires-Dist: czifile==2019.7.2
+Requires-Dist: freesimplegui==5.1.1
 Requires-Dist: imageio==2.34.0
 Requires-Dist: napari-console==0.0.9
 Requires-Dist: napari-plugin-engine==0.2.0
@@ -23,7 +24,6 @@ Requires-Dist: numpy==1.24.4
 Requires-Dist: openpyxl==3.1.2
 Requires-Dist: pandas==1.5.3
 Requires-Dist: pyarrow==11.0.0
-Requires-Dist: pysimplegui==4.60.5
 Requires-Dist: scikit-image==0.19.1
 Requires-Dist: scikit-learn==1.3.2
 Requires-Dist: scipy==1.9.1

small_fish_gui-1.9.3.dist-info/RECORD

@@ -0,0 +1,51 @@
+small_fish_gui/LICENSE,sha256=-iFy8VGBYs5VsHglKpk4D-hxqQ2jMJaqmfq_ulIzDks,1303
+small_fish_gui/README.md,sha256=4Nf5uOLMlNoX-3Kb9KZclLzPUAxWNAMi9el2a_7I9kA,4829
+small_fish_gui/Segmentation example.jpg,sha256=opfiSbjmfF6z8kBs08sg_FNR2Om0AcMPU5sSwSLHdoQ,215038
+small_fish_gui/__init__.py,sha256=OM_dE2QL2JVZ_bqEZmk2UdSJCocITwnLP3M5MzBs4as,1941
+small_fish_gui/__main__.py,sha256=Ssw1cF5FxExyEeFcRHEZYX_q7VNUExZkQ3wjQBotRNQ,1145
+small_fish_gui/hints.py,sha256=_AhC-Th36ELxinjMyGtjIqJfZkISPr1YwhQ9ifD9Kj4,1926
+small_fish_gui/napari_detection_example.png,sha256=l5EZlrbXemLiGqb5inSVsD6Kko1Opz528-go-fBfrw8,977350
+small_fish_gui/requirements.txt,sha256=z8iaxqarErZuMpmRKqcW07nfb_tQAOOkQ4LQSA9ovCk,322
+small_fish_gui/utils.py,sha256=LM6QW2ono_LIRv7JXIIq7ZxxbDXqBtZ5uR9gjKJfwM8,1903
+small_fish_gui/.github/workflows/python-publish.yml,sha256=5Ltnuhw9TevhzndlBmdUgYMnS73xEAxSyd1u8DHdn5s,1084
+small_fish_gui/batch/__init__.py,sha256=ku2_Yate-UG89Q0BmE2B9kFV4kOz-u9Lf2lj6VsdFXs,127
+small_fish_gui/batch/input.py,sha256=mqnP8LBhyNbtlcqjVlUiVeuHw4YxOX3GgzJbq03isKE,1477
+small_fish_gui/batch/integrity.py,sha256=qyttOwsukds6eE2j6NRmA8-fQtHxlnP4tgwQqrs3EWs,4853
+small_fish_gui/batch/pipeline.py,sha256=-XSyGTrk7WYhgLZLZeUoJvyzfcoprJTofUuIz623Irw,10419
+small_fish_gui/batch/prompt.py,sha256=OOwCn8TvAFIIm3fjhOfMwZkvXHk8fDgxefN_FO3p-5s,18851
+small_fish_gui/batch/test.py,sha256=FcoCngSeueociwVoG8V3C6lQO7rrRHUfIVA2hJKr4v4,213
+small_fish_gui/batch/update.py,sha256=uVenjjJBHZ3MeW5b20HzlSBueu3QZWEGLIEHRnPm-Tg,5044
+small_fish_gui/batch/utils.py,sha256=Pnmzlen8gmLBYBthMiUiK0TErjBBSId9SjKeBd9U6-U,1784
+small_fish_gui/batch/values.txt,sha256=eS19O1pdj0HYfwGUlWIpkvfNZQFxA3F4BDR8qahXh28,999
+small_fish_gui/gui/__init__.py,sha256=xQ_BfYcnQmKZtx_0leO4OmbkLNLv49ZPqEu_UXMgmDc,867
+small_fish_gui/gui/_napari_widgets.py,sha256=8IMppaPZU37ANdZwTZOhwqCEly0hokzYL7UIVIixGns,3022
+small_fish_gui/gui/animation.py,sha256=MnYsA1kxQZ72L_H0knxOs41lG0ZZv1re7gSgYNmZY00,983
+small_fish_gui/gui/help_module.py,sha256=_6ZTiCym1uYJTlKekPSmGCXQVr6z7TRaxEhRAL90Eko,9614
+small_fish_gui/gui/layout.py,sha256=ew5d3Mlr0DnC3j3uCWBzykEHJ8faa4wmKHZbiNOjdJY,14188
+small_fish_gui/gui/napari_visualiser.py,sha256=AmpUErfko1ZamYoORRsgR4JT9xRzQKpi-sFok-FFKtg,14569
+small_fish_gui/gui/prompts.py,sha256=1J1pohfNR0FBwqyUUp-fdA4IEH389Ope2KxVq_3bjrY,15408
+small_fish_gui/gui/testing.ipynb,sha256=5xoMDR2a3aa4q8KoEoJ22HrcWDyHkCF4arVeVVm7ovs,71500
+small_fish_gui/gui/screenshot/general_help_screenshot.png,sha256=X4E6Td5f04K-pBUPDaBJRAE3D5b8fuEdiAUKhkIDr-0,54210
+small_fish_gui/gui/screenshot/mapping_help_screenshot.png,sha256=HcuRh5TYciUogUasza5vZ_QSshaiHsskQK23mh9vQS8,34735
+small_fish_gui/gui/screenshot/segmentation_help_screenshot.png,sha256=rbSgIydT0gZtfMh1qk4mdMbEIyCaakvHmxa2eOrLwO0,118944
+small_fish_gui/interface/__init__.py,sha256=_yCOvJjrMGVeGx9Lkyqp7t3fAztt67w2ZKLPj8_kfYc,277
+small_fish_gui/interface/image.py,sha256=VBSfIVcR50aJxxbD_ILflPX4esW9lXPArfHpVQynzCc,1100
+small_fish_gui/interface/inoutput.py,sha256=FXKSSRrVou5VBWvTbiBjSCr7DncIyZbcV5MfRa6J64g,5467
+small_fish_gui/interface/testing.py,sha256=5GHjGn3YVJxfXGolMeg4SSCTBgPGl5R5bxQrpmsZ1yg,399
+small_fish_gui/pipeline/__init__.py,sha256=Oww6dcuvnktl5jFKLriz8ZXObKo9MkneE739A8C1reY,739
+small_fish_gui/pipeline/_colocalisation.py,sha256=PJ9IkICwPiaTNRTX4xqPhf1J3wyE2yAFRPtYEbw2k-A,21298
+small_fish_gui/pipeline/_custom_errors.py,sha256=tQ-AUhgzIFpK30AZiQQrtHCHyGVRDdAoIjzL0Fk-1pA,43
+small_fish_gui/pipeline/_preprocess.py,sha256=f8TSoieM8PXgEVemnOa1zW8LrfXdE9ZZ61kXcM4HOrk,15091
+small_fish_gui/pipeline/_signaltonoise.py,sha256=7A9t7xu7zghI6cr201Ldm-LjJ5NOuP56VSeJ8KIzcUo,8497
+small_fish_gui/pipeline/actions.py,sha256=YLuRoVwG0bdQ3LvwQDrObQZaHzsOMlntrayfxY13OCw,15941
+small_fish_gui/pipeline/detection.py,sha256=Pe_1e8FKqvVyhuDOPdb2LmDKpuvS7Vg1IXWX83HqTz4,35556
+small_fish_gui/pipeline/main.py,sha256=EmFiQoA86uLOmVAKZFjXW-wbgcQtCFMdFHKnkNUbZ1U,4831
+small_fish_gui/pipeline/segmentation.py,sha256=8oZVs6EF0cE89OfauR_sxpzf9uxtqjAuzi5FxkbOS7Q,19913
+small_fish_gui/pipeline/spots.py,sha256=9hNOGnOZhrtrIORt8UGBcI-SGCh1XftcUGerkBwN-QY,2201
+small_fish_gui/pipeline/test.py,sha256=w4ZMGDmUDXxVgWTlZ2TKw19W8q5gcE9gLMKe0SWnRrw,2827
+small_fish_gui/pipeline/testing.ipynb,sha256=Rs7VQ7TImNyUzT2_59JgbOjR5_Qs-0NjHHnqS87eiwA,76481
+small_fish_gui/pipeline/utils.py,sha256=run6qtqCAe_mFnE3o1CnmF1xBBmK3ydgc8-jOV9P-_w,448
+small_fish_gui-1.9.3.dist-info/METADATA,sha256=9_cLPkb_KqtU1no-mlAqrJL9z04IwpFYNkNnmrLnFqE,2568
+small_fish_gui-1.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+small_fish_gui-1.9.3.dist-info/licenses/LICENSE,sha256=-iFy8VGBYs5VsHglKpk4D-hxqQ2jMJaqmfq_ulIzDks,1303
+small_fish_gui-1.9.3.dist-info/RECORD,,

small_fish_gui/.readthedocs.yaml

@@ -1,21 +0,0 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
-# See for details
-
-# Required
-version: 2
-
-# Set the OS, Python version and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.8"
-
-# Build documentation in the "docs/" directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# Optionally build your docs in additional formats such as PDF and ePub
-formats:
-   - pdf
-   - epub

small_fish_gui-1.9.2.dist-info/RECORD

@@ -1,52 +0,0 @@
-small_fish_gui/.readthedocs.yaml,sha256=r2T0e_In8X8l0_ZwgPvuoWQ9c0PE9bSpFzV2W6EzW3g,409
-small_fish_gui/LICENSE,sha256=-iFy8VGBYs5VsHglKpk4D-hxqQ2jMJaqmfq_ulIzDks,1303
-small_fish_gui/README.md,sha256=4RpEXKZW5vH6sUWeZb88yr1TLLPi20PqOk7KdA9O9Hk,4234
-small_fish_gui/Segmentation example.jpg,sha256=opfiSbjmfF6z8kBs08sg_FNR2Om0AcMPU5sSwSLHdoQ,215038
-small_fish_gui/__init__.py,sha256=CweT7xLrnaM2nluNztpNf3JaNncL7gHLFz2SvVG1iZs,1941
-small_fish_gui/__main__.py,sha256=jjFNnf-l4jCJI16epq2KOaKmgtUAe9lSNdPj5fpxrDk,1143
-small_fish_gui/hints.py,sha256=_AhC-Th36ELxinjMyGtjIqJfZkISPr1YwhQ9ifD9Kj4,1926
-small_fish_gui/napari_detection_example.png,sha256=l5EZlrbXemLiGqb5inSVsD6Kko1Opz528-go-fBfrw8,977350
-small_fish_gui/requirements.txt,sha256=9OMfUAnLdHevq6w_fVoDmVmkSMJeFofkOK_86_fu9C0,321
-small_fish_gui/utils.py,sha256=LM6QW2ono_LIRv7JXIIq7ZxxbDXqBtZ5uR9gjKJfwM8,1903
-small_fish_gui/.github/workflows/python-publish.yml,sha256=5Ltnuhw9TevhzndlBmdUgYMnS73xEAxSyd1u8DHdn5s,1084
-small_fish_gui/batch/__init__.py,sha256=ku2_Yate-UG89Q0BmE2B9kFV4kOz-u9Lf2lj6VsdFXs,127
-small_fish_gui/batch/input.py,sha256=mqnP8LBhyNbtlcqjVlUiVeuHw4YxOX3GgzJbq03isKE,1477
-small_fish_gui/batch/integrity.py,sha256=jIJH0c_M_7gSET32iKWEznHIad0OwPNvJurA9rivTJ0,4851
-small_fish_gui/batch/pipeline.py,sha256=EUUY0L6JvUYyF1SqJ1KdQHKKR1jhxsHSCyBm7nnB7mU,9157
-small_fish_gui/batch/prompt.py,sha256=Ob6Cml3IJTInMJ_9kSwLOKzwna7igbk91D2eaA7I1bo,18849
-small_fish_gui/batch/test.py,sha256=q04a1YstnDsxy2Bi5563BfcOU-O3VPE9c5WSJjvFjMg,211
-small_fish_gui/batch/update.py,sha256=AFG2oW5zfbNPJbb1jqbkMexPB8NoR4ZoftqpO3cAsok,5042
-small_fish_gui/batch/utils.py,sha256=JGRgaPcNQ5V2Hr8ObtmmMKqm3fB237Iym6aBawWY8Oo,1782
-small_fish_gui/batch/values.txt,sha256=eS19O1pdj0HYfwGUlWIpkvfNZQFxA3F4BDR8qahXh28,999
-small_fish_gui/gui/__init__.py,sha256=xQ_BfYcnQmKZtx_0leO4OmbkLNLv49ZPqEu_UXMgmDc,867
-small_fish_gui/gui/_napari_widgets.py,sha256=8IMppaPZU37ANdZwTZOhwqCEly0hokzYL7UIVIixGns,3022
-small_fish_gui/gui/animation.py,sha256=rnNP5FPp06Hu-R33c4AVTCknALBbxT2YlsKFCXHAp9k,981
-small_fish_gui/gui/help_module.py,sha256=XvGCNIcEGRG8ESJ55poCPhBM60Bl4w_ZxoVp-Ev6lTo,9612
-small_fish_gui/gui/layout.py,sha256=cA8ddzwbxVqTl5-VOoKvYKP0Fki17x2dczidSdW3ayA,14186
-small_fish_gui/gui/napari_visualiser.py,sha256=BSoLZtBBdbL407xrio3ZzaU_ZdP7I2T34-zQFntxwEs,14539
-small_fish_gui/gui/prompts.py,sha256=akphsDghaUngmqz3yBpyMPeTrRfye-Flkyixc9JSs74,15406
-small_fish_gui/gui/testing.ipynb,sha256=5xoMDR2a3aa4q8KoEoJ22HrcWDyHkCF4arVeVVm7ovs,71500
-small_fish_gui/gui/screenshot/general_help_screenshot.png,sha256=X4E6Td5f04K-pBUPDaBJRAE3D5b8fuEdiAUKhkIDr-0,54210
-small_fish_gui/gui/screenshot/mapping_help_screenshot.png,sha256=HcuRh5TYciUogUasza5vZ_QSshaiHsskQK23mh9vQS8,34735
-small_fish_gui/gui/screenshot/segmentation_help_screenshot.png,sha256=rbSgIydT0gZtfMh1qk4mdMbEIyCaakvHmxa2eOrLwO0,118944
-small_fish_gui/interface/__init__.py,sha256=_yCOvJjrMGVeGx9Lkyqp7t3fAztt67w2ZKLPj8_kfYc,277
-small_fish_gui/interface/image.py,sha256=VBSfIVcR50aJxxbD_ILflPX4esW9lXPArfHpVQynzCc,1100
-small_fish_gui/interface/inoutput.py,sha256=f20t9WDub8xLELCYGMvTsB3LzSxYusnpkMYQy9LrNwU,5026
-small_fish_gui/interface/testing.py,sha256=MMWNzAUE_Le3fqt2HY9rLXHQKv5c8ujON2PTooNnyLw,397
-small_fish_gui/pipeline/__init__.py,sha256=Oww6dcuvnktl5jFKLriz8ZXObKo9MkneE739A8C1reY,739
-small_fish_gui/pipeline/_colocalisation.py,sha256=oNMKfl2sUmFR4ipHEfvVbkOLf94_dmE-ay_co6kt2T0,21231
-small_fish_gui/pipeline/_custom_errors.py,sha256=tQ-AUhgzIFpK30AZiQQrtHCHyGVRDdAoIjzL0Fk-1pA,43
-small_fish_gui/pipeline/_preprocess.py,sha256=IrkQp_YCVFPrwElCEn-alpVChfLbR_0KAdb0WV2BfKI,15089
-small_fish_gui/pipeline/_signaltonoise.py,sha256=7A9t7xu7zghI6cr201Ldm-LjJ5NOuP56VSeJ8KIzcUo,8497
-small_fish_gui/pipeline/actions.py,sha256=7DmChUin3Zct7utVKj4zRpSMu4i5m2ctheOevbNCxa8,15745
-small_fish_gui/pipeline/detection.py,sha256=X2SmfHTnb2322PimxkXJ9gEco2cCZQ3eCKhfCRzk6hg,34953
-small_fish_gui/pipeline/main.py,sha256=2Oi6wz9jG9LA2gclTkIeFolJ4AON5AN6fFldOQsaXGw,4829
-small_fish_gui/pipeline/segmentation.py,sha256=MtGOcGWJPaJo7oa0YG2qB7LwDLIogJHCioSQxFecUqc,19911
-small_fish_gui/pipeline/spots.py,sha256=9hNOGnOZhrtrIORt8UGBcI-SGCh1XftcUGerkBwN-QY,2201
-small_fish_gui/pipeline/test.py,sha256=w4ZMGDmUDXxVgWTlZ2TKw19W8q5gcE9gLMKe0SWnRrw,2827
-small_fish_gui/pipeline/testing.ipynb,sha256=eMynROxPIa5uW6E2nb_CwA4X4Peiqa4QS68JcADrAnM,76479
-small_fish_gui/pipeline/utils.py,sha256=run6qtqCAe_mFnE3o1CnmF1xBBmK3ydgc8-jOV9P-_w,448
-small_fish_gui-1.9.2.dist-info/METADATA,sha256=Bq71I80yaGJukLnxynPExQGh5i8hwxHKMfi2sreR0YQ,2567
-small_fish_gui-1.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-small_fish_gui-1.9.2.dist-info/licenses/LICENSE,sha256=-iFy8VGBYs5VsHglKpk4D-hxqQ2jMJaqmfq_ulIzDks,1303
-small_fish_gui-1.9.2.dist-info/RECORD,,