nettracer3d 0.6.8__py3-none-any.whl → 0.7.0__py3-none-any.whl

nettracer3d/smart_dilate.py

@@ -188,11 +188,9 @@ def dilate_3D_dt(array, search_distance, xy_scaling=1.0, z_scaling=1.0, GPU = Fa
     Returns:
     Dilated 3D array
     """
-    if array.shape[0] == 1:
 
-        return nettracer.dilate_2D(array, search_distance, scaling = xy_scaling)
-
-    # Determine which dimension needs resampling
+    # Determine which dimension needs resampling. the moral of the story is read documentation before you do something unecessary.
+    """
     if (z_scaling > xy_scaling):
         # Z dimension needs to be stretched
         zoom_factor = [z_scaling/xy_scaling, 1, 1]  # Scale factor for [z, y, x]
@@ -208,11 +206,11 @@ def dilate_3D_dt(array, search_distance, xy_scaling=1.0, z_scaling=1.0, GPU = Fa
         zoom_factor = None
         rev_factor = None
         cardinal = xy_scaling
-
+    """
 
     # Resample the mask if needed
-    if zoom_factor:
-        array = ndimage.zoom(array, zoom_factor, order=0)  # Use order=0 for binary masks
+    #if zoom_factor:
+        #array = ndimage.zoom(array, zoom_factor, order=0)  # Use order=0 for binary masks
 
     # Invert the array (find background)
     inv = array < 1
@@ -220,22 +218,21 @@ def dilate_3D_dt(array, search_distance, xy_scaling=1.0, z_scaling=1.0, GPU = Fa
     if GPU:
         try:
             print("Attempting on GPU...")
-            inv, indices = compute_distance_transform_GPU(inv, return_dists = True)
+            inv, indices = compute_distance_transform_GPU(inv, return_dists = True, sampling = [z_scaling, xy_scaling, xy_scaling])
         except:
             print("Failed, attempting on CPU...")
             #Who would have seen this coming?:
-            inv, indices = compute_distance_transform(inv, return_dists = True)
+            inv, indices = compute_distance_transform(inv, return_dists = True, sampling = [z_scaling, xy_scaling, xy_scaling])
     else:
-        inv, indices = compute_distance_transform(inv, return_dists = True)
+        inv, indices = compute_distance_transform(inv, return_dists = True, sampling = [z_scaling, xy_scaling, xy_scaling])
 
 
-    inv = inv * cardinal
+    #inv = inv * cardinal
     
     # Threshold the distance transform to get dilated result
     inv = inv <= search_distance
 
-
-    return inv.astype(np.uint8), indices, array, rev_factor
+    return inv.astype(np.uint8), indices, array
 
 
 
@@ -275,7 +272,7 @@ def smart_dilate(nodes, dilate_xy, dilate_z, directory = None, GPU = True, fast_
         binary_nodes = binarize(nodes)
         dilated_binary_nodes = dilate_3D(binary_nodes, dilate_xy, dilate_xy, dilate_z)
     else:
-        dilated_binary_nodes, nearest_label_indices, nodes, rev_factor = dilate_3D_dt(nodes, use_dt_dil_amount, GPU = GPU, xy_scaling = xy_scale, z_scaling = z_scale)
+        dilated_binary_nodes, nearest_label_indices, nodes = dilate_3D_dt(nodes, use_dt_dil_amount, GPU = GPU, xy_scaling = xy_scale, z_scaling = z_scale)
         binary_nodes = binarize(nodes)
 
     # Step 3: Isolate the ring (binary dilated mask minus original binary mask)
@@ -352,8 +349,6 @@ def smart_dilate(nodes, dilate_xy, dilate_z, directory = None, GPU = True, fast_
     if (dilated_nodes_with_labels.shape[1] < original_shape[1]) and fast_dil: #If downsample was used, upsample output
         dilated_nodes_with_labels = nettracer.upsample_with_padding(dilated_nodes_with_labels, downsample_needed, original_shape)
         dilated_nodes_with_labels = dilated_nodes_with_labels * dilated_mask
-    elif (dilated_nodes_with_labels.shape[1] != original_shape[1]) and not fast_dil:
-        dilated_nodes_with_labels = ndimage.zoom(dilated_nodes_with_labels, rev_factor, order=0)
 
     if directory is not None:
         try:
@@ -472,16 +467,17 @@ def smart_label(binary_array, label_array, directory = None, GPU = True, predown
 
     return dilated_nodes_with_labels
 
-def compute_distance_transform_GPU(nodes, return_dists = False):
+def compute_distance_transform_GPU(nodes, return_dists = False, sampling = [1, 1, 1]):
     is_pseudo_3d = nodes.shape[0] == 1
     if is_pseudo_3d:
         nodes = np.squeeze(nodes)  # Convert to 2D for processing
+        del sampling[0]
     
     # Convert numpy array to CuPy array
     nodes_cp = cp.asarray(nodes)
     
     # Compute the distance transform on the GPU
-    dists, nearest_label_indices = cpx.distance_transform_edt(nodes_cp, return_indices=True)
+    dists, nearest_label_indices = cpx.distance_transform_edt(nodes_cp, return_indices=True, sampling = sampling)
     
     # Convert results back to numpy arrays
     nearest_label_indices_np = cp.asnumpy(nearest_label_indices)
@@ -504,12 +500,13 @@ def compute_distance_transform_GPU(nodes, return_dists = False):
         return dists, nearest_label_indices_np
 
 
-def compute_distance_transform(nodes, return_dists = False):
+def compute_distance_transform(nodes, return_dists = False, sampling = [1, 1, 1]):
     is_pseudo_3d = nodes.shape[0] == 1
     if is_pseudo_3d:
         nodes = np.squeeze(nodes)  # Convert to 2D for processing
+        del sampling[0]
 
-    dists, nearest_label_indices = distance_transform_edt(nodes, return_indices=True)
+    dists, nearest_label_indices = distance_transform_edt(nodes, return_indices=True, sampling = sampling)
 
     if is_pseudo_3d:
         # For 2D input, we get (2, H, W) but need (3, 1, H, W)
@@ -529,17 +526,18 @@ def compute_distance_transform(nodes, return_dists = False):
 
 
 
-def compute_distance_transform_distance_GPU(nodes):
+def compute_distance_transform_distance_GPU(nodes, sampling = [1, 1, 1]):
 
     is_pseudo_3d = nodes.shape[0] == 1
     if is_pseudo_3d:
         nodes = np.squeeze(nodes)  # Convert to 2D for processing
+        del sampling[0]
 
     # Convert numpy array to CuPy array
     nodes_cp = cp.asarray(nodes)
     
     # Compute the distance transform on the GPU
-    distance = cpx.distance_transform_edt(nodes_cp)
+    distance = cpx.distance_transform_edt(nodes_cp, sampling = sampling)
     
     # Convert results back to numpy arrays
     distance = cp.asnumpy(distance)
@@ -550,14 +548,15 @@ def compute_distance_transform_distance_GPU(nodes):
     return distance    
 
 
-def compute_distance_transform_distance(nodes):
+def compute_distance_transform_distance(nodes, sampling = [1, 1, 1]):
 
     is_pseudo_3d = nodes.shape[0] == 1
     if is_pseudo_3d:
         nodes = np.squeeze(nodes)  # Convert to 2D for processing
+        del sampling[0]
 
     # Fallback to CPU if there's an issue with GPU computation
-    distance = distance_transform_edt(nodes)
+    distance = distance_transform_edt(nodes, sampling = sampling)
     if is_pseudo_3d:
         np.expand_dims(distance, axis = 0)
     return distance

{nettracer3d-0.6.8.dist-info → nettracer3d-0.7.0.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.6.8
+Version: 0.7.0
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
-Author-email: Liam McLaughlin <mclaughlinliam99@gmail.com>
-Project-URL: User_Tutorial, https://www.youtube.com/watch?v=cRatn5VTWDY
+Author-email: Liam McLaughlin <liamm@wustl.edu>
+Project-URL: Documentation, https://nettracer3d.readthedocs.io/en/latest/
+Project-URL: Video_Tutorial, https://www.youtube.com/watch?v=cRatn5VTWDY
 Project-URL: Reference_Citation_For_Use, https://doi.org/10.1101/2024.07.29.605633
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: ==3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy==1.26.4
@@ -38,16 +39,48 @@ Dynamic: license-file
 
 NetTracer3D is a python package developed for both 2D and 3D analysis of microscopic images in the .tif file format. It supports generation of 3D networks showing the relationships between objects (or nodes) in three dimensional space, either based on their own proximity or connectivity via connecting objects such as nerves or blood vessels. In addition to these functionalities are several advanced 3D data processing algorithms, such as labeling of branched structures or abstraction of branched structures into networks. Note that nettracer3d uses segmented data, which can be segmented from other softwares such as ImageJ and imported into NetTracer3D, although it does offer its own segmentation via intensity and volumetric thresholding, or random forest machine learning segmentation. NetTracer3D currently has a fully functional GUI. To use the GUI, after installing the nettracer3d package via pip, enter the command 'nettracer3d' in your command prompt:
 
+--- Documentation ---
 
-This gui is built from the PyQt6 package and therefore may not function on dockers or virtual envs that are unable to support PyQt6 displays. More advanced documentation is coming down the line, but for now please see: https://www.youtube.com/watch?v=cRatn5VTWDY
-for a video tutorial on using the GUI.
+Please see: https://nettracer3d.readthedocs.io/en/latest/
+
+--- Installation ---
+
+To install nettracer3d, simply install Python and use this command in your command terminal:
+
+pip install nettracer3d
+
+I recommend installing the program as an Anaconda package to ensure its modules are work together on your specific system:
+(Install anaconda at the link below, set up a new python env for nettracer3d, then use the same pip command).
+
+https://www.anaconda.com/download?utm_source=anacondadocs&utm_medium=documentation&utm_campaign=download&utm_content=installwindows
+
+nettracer3d mostly utilizes the CPU for processing and visualization, although it does have a few GPU-aided options. If you would like to use the GPU for these, you will need an NVIDIA GPU and a corresponding CUDA toolkit which can be installed here:
+https://developer.nvidia.com/cuda-toolkit
+
+To install nettracer3d with associated GPU-supporting packages, please use:
+
+If your CUDA toolkit is version 11: pip install nettracer3d[CUDA11]
+If your CUDA toolkit is version 12: pip install nettracer3d[CUDA12]
+If you just want the entire cupy library: pip install nettracer3d[cupy]
+
+
+This gui is built from the PyQt6 package and therefore may not function on dockers or virtual envs that are unable to support PyQt6 displays.
+
+
+For a (slightly outdated) video tutorial on using the GUI: https://www.youtube.com/watch?v=cRatn5VTWDY
 
 NetTracer3D is free to use/fork for academic/nonprofit use so long as citation is provided, and is available for commercial use at a fee (see license file for information).
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.6.8 updates --
+-- Version 0.7.0 Updates -- 
+
+1. Added new function in 'Analyze -> Stats -> Cluster Analysis'
+    * This function allows the user to create a ripley's K or H function to compare the relative clustering of two types of nodes, or of one type of node vs itself.
 
-1. Added new fill-can and 3D-brush functionalities to the brush mode (press f in brush mode to toggle the fill can. Press d while in brush mode to use the 3D painting tools. Standard Mouse wheel scrolling in the 3D painter will change how many frames you paint on - ie. 5 lets you paint 2 above and 2 below).
+2. Added new function in 'Analyze -> Randomize -> Scramble Nodes'
+    * This function randomly rearranges the node (centroids) for comparison with other centroid-using methods, as a possible way to demonstrate non-random behavior.
+    * The randomize menu is likewise new and the 'Generate Equivalent Random Network' method was moved there.
 
-1.5. Added single-use ctrl-z functionality to the fill can only because of how easily it can mess up. (Leaving the fill can mode will garbage collect the backup image though).
+3. Bug fixes.
+    * Importantly fixed a bug with dt-based dilation not working in 2D, which I had accidentally introduced recently.

nettracer3d-0.7.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+nettracer3d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nettracer3d/community_extractor.py,sha256=5v9SCCLX3P1RX0fjPVKH5NHMFkMolZ5BTe0bR_a67xg,24479
+nettracer3d/modularity.py,sha256=FH3GpTHorRNkdQULe-2DWgFE3i0_u__hrao7Nx_6Ge4,30249
+nettracer3d/morphology.py,sha256=kEzuzBxHHpWt3o_LHMXYJGJT8-Z_dEP99QpZjOkavzE,19742
+nettracer3d/nettracer.py,sha256=dnnWEr9xpzoxV-NqLJm4DAFmZJ25CSjhA85AR_LT8Qc,218452
+nettracer3d/nettracer_gui.py,sha256=jeqsjaLGdaXdPcuy3Z3iEVnaOvyGDTEjD8uVkoNPFtk,426501
+nettracer3d/network_analysis.py,sha256=q1q7lxtA3lebxitfC_jfiT9cnpYXJw4q0Oy2_-Aj8qE,48068
+nettracer3d/network_draw.py,sha256=F7fw6Pcf4qWOhdKwLmhwqWdschbDlHzwCVolQC9imeU,14117
+nettracer3d/node_draw.py,sha256=k3sCTfUCJs3aH1C1q1gTNxDz9EAQbBd1hsUIJajxRx8,9823
+nettracer3d/proximity.py,sha256=2Fj1UTKDEFBf7r1SgWXhiSINOTMjP4G5_Egu58l2zTk,24756
+nettracer3d/run.py,sha256=xYeaAc8FCx8MuzTGyL3NR3mK7WZzffAYAH23bNRZYO4,127
+nettracer3d/segmenter.py,sha256=gJS2AXqHhnw29cbzIxAah2LsrE7_7XnzG7mYSAovZ4I,87847
+nettracer3d/simple_network.py,sha256=fP1gkDdtQcHruEZpUdasKdZeVacoLOxKhR3bY0L1CAQ,15426
+nettracer3d/smart_dilate.py,sha256=MNFz-7P56OFwkNx2N24SH4gV0kL3KwzmZvAxg-T7f3U,25781
+nettracer3d-0.7.0.dist-info/licenses/LICENSE,sha256=gM207DhJjWrxLuEWXl0Qz5ISbtWDmADfjHp3yC2XISs,888
+nettracer3d-0.7.0.dist-info/METADATA,sha256=AqntVh2fF1VwxjLMongf_L9JpmNuZSO2irf_sFXrHvE,4955
+nettracer3d-0.7.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+nettracer3d-0.7.0.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
+nettracer3d-0.7.0.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
+nettracer3d-0.7.0.dist-info/RECORD,,

{nettracer3d-0.6.8.dist-info → nettracer3d-0.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nettracer3d-0.6.8.dist-info/RECORD

@@ -1,20 +0,0 @@
-nettracer3d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nettracer3d/community_extractor.py,sha256=5v9SCCLX3P1RX0fjPVKH5NHMFkMolZ5BTe0bR_a67xg,24479
-nettracer3d/modularity.py,sha256=V1f3s_vGd8EuVz27mzq6ycIGr0BWIpH7c7NU4QjgAHU,30247
-nettracer3d/morphology.py,sha256=P7hH9qpDBs0JtMSd95NmrvqoyD8BVq3AjAYv-MWoS_Y,19498
-nettracer3d/nettracer.py,sha256=HDU7z9UOpc2rK1tp-gV7vum27NBNVe8CmfZEeJ7lDBc,209469
-nettracer3d/nettracer_gui.py,sha256=Uo7INQF89Jb5YioqAjH25Qxxk2rMA9Y5J2hZ35s8ySU,409270
-nettracer3d/network_analysis.py,sha256=q1q7lxtA3lebxitfC_jfiT9cnpYXJw4q0Oy2_-Aj8qE,48068
-nettracer3d/network_draw.py,sha256=F7fw6Pcf4qWOhdKwLmhwqWdschbDlHzwCVolQC9imeU,14117
-nettracer3d/node_draw.py,sha256=k3sCTfUCJs3aH1C1q1gTNxDz9EAQbBd1hsUIJajxRx8,9823
-nettracer3d/proximity.py,sha256=B9DfbYMzxdlksQTY6EjyGi8iSQ54RZ5OEqfze2IOrBo,10916
-nettracer3d/run.py,sha256=xYeaAc8FCx8MuzTGyL3NR3mK7WZzffAYAH23bNRZYO4,127
-nettracer3d/segmenter.py,sha256=NcNeLSfg3ox-CfnUajT1E2iDqDkv5H6zSJOK_L5N4YI,85020
-nettracer3d/simple_network.py,sha256=fP1gkDdtQcHruEZpUdasKdZeVacoLOxKhR3bY0L1CAQ,15426
-nettracer3d/smart_dilate.py,sha256=ISZR6v52zf-MwhGx-JTfTOP8uo7pNGt-GJj7ydeuMAo,25587
-nettracer3d-0.6.8.dist-info/licenses/LICENSE,sha256=gM207DhJjWrxLuEWXl0Qz5ISbtWDmADfjHp3yC2XISs,888
-nettracer3d-0.6.8.dist-info/METADATA,sha256=-uaII8GnsHBV7nt_rmSlntFKv9QCDujtfhSEd_OuKVM,3523
-nettracer3d-0.6.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nettracer3d-0.6.8.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
-nettracer3d-0.6.8.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
-nettracer3d-0.6.8.dist-info/RECORD,,