nettracer3d 0.2.9__tar.gz → 0.3.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {nettracer3d-0.2.9/src/nettracer3d.egg-info → nettracer3d-0.3.0}/PKG-INFO +1 -1
  2. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/pyproject.toml +1 -1
  3. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/nettracer.py +19 -13
  4. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/network_analysis.py +0 -1
  5. {nettracer3d-0.2.9 → nettracer3d-0.3.0/src/nettracer3d.egg-info}/PKG-INFO +1 -1
  6. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/LICENSE +0 -0
  7. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/README.md +0 -0
  8. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/setup.cfg +0 -0
  9. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/__init__.py +0 -0
  10. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/community_extractor.py +0 -0
  11. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/hub_getter.py +0 -0
  12. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/modularity.py +0 -0
  13. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/morphology.py +0 -0
  14. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/nettracer_gui.py +0 -0
  15. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/network_draw.py +0 -0
  16. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/node_draw.py +0 -0
  17. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/proximity.py +0 -0
  18. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/simple_network.py +0 -0
  19. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d/smart_dilate.py +0 -0
  20. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d.egg-info/SOURCES.txt +0 -0
  21. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d.egg-info/dependency_links.txt +0 -0
  22. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d.egg-info/requires.txt +0 -0
  23. {nettracer3d-0.2.9 → nettracer3d-0.3.0}/src/nettracer3d.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: nettracer3d
3
- Version: 0.2.9
3
+ Version: 0.3.0
4
4
  Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
5
5
  Author-email: Liam McLaughlin <boom2449@gmail.com>
6
6
  Project-URL: User_Manual, https://drive.google.com/drive/folders/1fTkz3n4LN9_VxKRKC8lVQSlrz_wq0bVn?usp=drive_link
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "nettracer3d"
3
- version = "0.2.9"
3
+ version = "0.3.0"
4
4
  authors = [
5
5
  { name="Liam McLaughlin", email="boom2449@gmail.com" },
6
6
  ]
@@ -696,29 +696,35 @@ def fill_holes_3d(array):
696
696
 
697
697
  array = binarize(array)
698
698
  inv_array = invert_array(array)
699
+
699
700
 
700
701
  # Create arrays for all three planes
701
702
  array_xy = np.zeros_like(inv_array, dtype=np.uint8)
702
703
  array_xz = np.zeros_like(inv_array, dtype=np.uint8)
703
704
  array_yz = np.zeros_like(inv_array, dtype=np.uint8)
704
-
705
+
706
+
705
707
  # Process XY plane
706
708
  for z in range(inv_array.shape[0]):
707
709
  array_xy[z] = process_slice(inv_array[z])
710
+
711
+ if array.shape[0] > 3: #only use these dimensions for sufficiently large zstacks
708
712
 
709
- # Process XZ plane
710
- for y in range(inv_array.shape[1]):
711
- slice_xz = inv_array[:, y, :]
712
- array_xz[:, y, :] = process_slice(slice_xz)
713
+ # Process XZ plane
714
+ for y in range(inv_array.shape[1]):
715
+ slice_xz = inv_array[:, y, :]
716
+ array_xz[:, y, :] = process_slice(slice_xz)
717
+
718
+ # Process YZ plane
719
+ for x in range(inv_array.shape[2]):
720
+ slice_yz = inv_array[:, :, x]
721
+ array_yz[:, :, x] = process_slice(slice_yz)
713
722
 
714
- # Process YZ plane
715
- for x in range(inv_array.shape[2]):
716
- slice_yz = inv_array[:, :, x]
717
- array_yz[:, :, x] = process_slice(slice_yz)
718
-
719
- # Combine results from all three planes
720
- filled = (array_xy | array_xz | array_yz) * 255
721
- return array + filled
723
+ # Combine results from all three planes
724
+ filled = (array_xy | array_xz | array_yz) * 255
725
+ return array + filled
726
+ else:
727
+ return array_xy * 255
722
728
 
723
729
 
724
730
 
@@ -157,7 +157,6 @@ def read_excel_to_lists(file_path, sheet_name=0):
157
157
  master_list[2].extend([int(x) for x in data_lists[i+2]])
158
158
  except IndexError:
159
159
  master_list[2].extend([0]) # Note: Changed to list with single int 0
160
- print(master_list)
161
160
 
162
161
  return master_list
163
162
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: nettracer3d
3
- Version: 0.2.9
3
+ Version: 0.3.0
4
4
  Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
5
5
  Author-email: Liam McLaughlin <boom2449@gmail.com>
6
6
  Project-URL: User_Manual, https://drive.google.com/drive/folders/1fTkz3n4LN9_VxKRKC8lVQSlrz_wq0bVn?usp=drive_link
File without changes
File without changes
File without changes