nettracer3d 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl

nettracer3d/proximity.py

@@ -64,13 +64,13 @@ def reslice_3d_array(args):
 
 
 
-def _get_node_node_dict(label_array, label, dilate_xy, dilate_z):
+def _get_node_node_dict(label_array, label, dilate_xy, dilate_z, fastdil = False, xy_scale = 1, z_scale = 1, search = 0):
     """Internal method used for the secondary algorithm to find which nodes interact 
     with which other nodes based on proximity."""
     
     # Create a boolean mask where elements with the specified label are True
     binary_array = label_array == label
-    binary_array = nettracer.dilate_3D_recursive(binary_array, dilate_xy, dilate_xy, dilate_z) #Dilate the label to see where the dilated label overlaps
+    binary_array = nettracer.dilate(binary_array, search, xy_scale, z_scale, fast_dil = fastdil, dilate_xy = dilate_xy, dilate_z = dilate_z) #Dilate the label to see where the dilated label overlaps
     label_array = label_array * binary_array  # Filter the labels by the node in question
     label_array = label_array.flatten()  # Convert 3d array to 1d array
     label_array = nettracer.remove_zeros(label_array)  # Remove zeros
@@ -82,7 +82,7 @@ def _get_node_node_dict(label_array, label, dilate_xy, dilate_z):
 def process_label(args):
     """Modified to use pre-computed bounding boxes instead of argwhere"""
     nodes, label, dilate_xy, dilate_z, array_shape, bounding_boxes = args
-    print(f"Processing node {label}")
+    #print(f"Processing node {label}")
     
     # Get the pre-computed bounding box for this label
     slice_obj = bounding_boxes[label-1]  # -1 because label numbers start at 1
@@ -97,10 +97,11 @@ def process_label(args):
     return label, sub_nodes
 
 
-def create_node_dictionary(nodes, num_nodes, dilate_xy, dilate_z, targets=None):
-    """Modified to pre-compute all bounding boxes using find_objects"""
+def create_node_dictionary(nodes, num_nodes, dilate_xy, dilate_z, targets=None, fastdil = False, xy_scale = 1, z_scale = 1, search = 0):
+    """pre-compute all bounding boxes using find_objects"""
     node_dict = {}
     array_shape = nodes.shape
+
     
     # Get all bounding boxes at once
     bounding_boxes = ndimage.find_objects(nodes)
@@ -118,17 +119,17 @@ def create_node_dictionary(nodes, num_nodes, dilate_xy, dilate_z, targets=None):
 
         # Process results in parallel
         for label, sub_nodes in results:
-            executor.submit(create_dict_entry, node_dict, label, sub_nodes, dilate_xy, dilate_z)
+            executor.submit(create_dict_entry, node_dict, label, sub_nodes, dilate_xy, dilate_z, fastdil = fastdil, xy_scale = xy_scale, z_scale = z_scale, search = search)
 
     return node_dict
 
-def create_dict_entry(node_dict, label, sub_nodes, dilate_xy, dilate_z):
+def create_dict_entry(node_dict, label, sub_nodes, dilate_xy, dilate_z, fastdil = False, xy_scale = 1, z_scale = 1, search = 0):
     """Internal method used for the secondary algorithm to pass around args in parallel."""
 
     if label is None:
         pass
     else:
-        node_dict[label] = _get_node_node_dict(sub_nodes, label, dilate_xy, dilate_z)
+        node_dict[label] = _get_node_node_dict(sub_nodes, label, dilate_xy, dilate_z, fastdil = fastdil, xy_scale = xy_scale, z_scale = z_scale, search = search)
 
 def find_shared_value_pairs(input_dict):
     """Internal method used for the secondary algorithm to look through discrete