small-fish-gui 1.9.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

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.0"
+__version__ = "1.9.1"

small_fish_gui/batch/pipeline.py

@@ -120,7 +120,7 @@ def batch_pipeline(
         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 = launch_detection(
+            parameters, frame_result, spots, clusters, spot_cluster_id = launch_detection(
                 image,
                 other_image,
                 parameters,
@@ -139,7 +139,7 @@ def batch_pipeline(
         if parameters['save detection'] :
             if parameters['do_cluster_computation'] : 
                 if len(clusters) > 0 :
-                    spots_list = [spots, clusters[:,:parameters['dim']]]
+                    spots_list = [spots, clusters[:,:-2]]
                 else : spots_list = [spots]
             else : spots_list = [spots]
             output_spot_tiffvisual(
@@ -166,6 +166,7 @@ def batch_pipeline(
                     user_parameters=parameters,
                     image=image,
                     spots=spots,
+                    cluster_id=spot_cluster_id,
                     nucleus_label= nucleus_label,
                     cell_label= cytoplasm_label,
                 )
@@ -178,6 +179,7 @@ def batch_pipeline(
         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,

{small_fish_gui-1.9.0.dist-info → small_fish_gui-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: small_fish_gui
-Version: 1.9.0
+Version: 1.9.1
 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

{small_fish_gui-1.9.0.dist-info → small_fish_gui-1.9.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ small_fish_gui/.readthedocs.yaml,sha256=r2T0e_In8X8l0_ZwgPvuoWQ9c0PE9bSpFzV2W6Ez
 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=NAO9zD3llJ5ST2ZjY5DmlJ5Yncl50TO84Gp5568YQQ8,1941
+small_fish_gui/__init__.py,sha256=M1CS65MKPvigTfxKbIQcEavjtD309_uiJBfJtBTN8oA,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
@@ -12,7 +12,7 @@ small_fish_gui/.github/workflows/python-publish.yml,sha256=5Ltnuhw9TevhzndlBmdUg
 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=ZFb1cGinm-4WLy1vpvPBFA_MvUXQ4UvXkYA74en670c,9065
+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
@@ -46,7 +46,7 @@ small_fish_gui/pipeline/spots.py,sha256=9hNOGnOZhrtrIORt8UGBcI-SGCh1XftcUGerkBwN
 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.0.dist-info/METADATA,sha256=EN_U5bakmWkSKdm2197zNPXWMuFnxS87oLNWSC7vOpM,2567
-small_fish_gui-1.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-small_fish_gui-1.9.0.dist-info/licenses/LICENSE,sha256=-iFy8VGBYs5VsHglKpk4D-hxqQ2jMJaqmfq_ulIzDks,1303
-small_fish_gui-1.9.0.dist-info/RECORD,,
+small_fish_gui-1.9.1.dist-info/METADATA,sha256=yCnUaZp6Yoi9vRVfRsekRoyOLV2nzjycs5j6fyh7zsY,2567
+small_fish_gui-1.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+small_fish_gui-1.9.1.dist-info/licenses/LICENSE,sha256=-iFy8VGBYs5VsHglKpk4D-hxqQ2jMJaqmfq_ulIzDks,1303
+small_fish_gui-1.9.1.dist-info/RECORD,,