nettracer3d 0.5.0__tar.gz → 0.5.1__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 (26) hide show
  1. {nettracer3d-0.5.0/src/nettracer3d.egg-info → nettracer3d-0.5.1}/PKG-INFO +1 -1
  2. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/pyproject.toml +1 -1
  3. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/nettracer_gui.py +19 -14
  4. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/smart_dilate.py +1 -1
  5. {nettracer3d-0.5.0 → nettracer3d-0.5.1/src/nettracer3d.egg-info}/PKG-INFO +1 -1
  6. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/LICENSE +0 -0
  7. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/README.md +0 -0
  8. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/setup.cfg +0 -0
  9. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/__init__.py +0 -0
  10. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/community_extractor.py +0 -0
  11. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/hub_getter.py +0 -0
  12. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/modularity.py +0 -0
  13. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/morphology.py +0 -0
  14. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/nettracer.py +0 -0
  15. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/network_analysis.py +0 -0
  16. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/network_draw.py +0 -0
  17. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/node_draw.py +0 -0
  18. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/proximity.py +0 -0
  19. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/run.py +0 -0
  20. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/segmenter.py +0 -0
  21. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d/simple_network.py +0 -0
  22. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d.egg-info/SOURCES.txt +0 -0
  23. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d.egg-info/dependency_links.txt +0 -0
  24. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d.egg-info/entry_points.txt +0 -0
  25. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/src/nettracer3d.egg-info/requires.txt +0 -0
  26. {nettracer3d-0.5.0 → nettracer3d-0.5.1}/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.5.0
3
+ Version: 0.5.1
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.5.0"
3
+ version = "0.5.1"
4
4
  authors = [
5
5
  { name="Liam McLaughlin", email="boom2449@gmail.com" },
6
6
  ]
@@ -2065,18 +2065,19 @@ class ImageViewerWindow(QMainWindow):
2065
2065
  x_idx = int(round(event.xdata))
2066
2066
  y_idx = int(round(event.ydata))
2067
2067
  # Check if Ctrl key is pressed (using matplotlib's key_press system)
2068
- ctrl_pressed = 'ctrl' in event.modifiers
2069
- if self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx] != 0:
2070
- clicked_value = self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx]
2071
- else:
2072
- if not ctrl_pressed:
2073
- self.clicked_values = {
2074
- 'nodes': [],
2075
- 'edges': []
2076
- }
2077
- self.create_highlight_overlay()
2078
- return
2079
-
2068
+ ctrl_pressed = 'ctrl' in event.modifiers
2069
+ if len(self.channel_data[self.active_channel].shape) != 4:
2070
+ if self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx] != 0:
2071
+ clicked_value = self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx]
2072
+ else:
2073
+ if not ctrl_pressed:
2074
+ self.clicked_values = {
2075
+ 'nodes': [],
2076
+ 'edges': []
2077
+ }
2078
+ self.create_highlight_overlay()
2079
+ return
2080
+
2080
2081
 
2081
2082
  starting_vals = copy.deepcopy(self.clicked_values)
2082
2083
 
@@ -5834,8 +5835,12 @@ class MachineWindow(QMainWindow):
5834
5835
 
5835
5836
  if self.parent().active_channel == 0:
5836
5837
  if self.parent().channel_data[0] is not None:
5837
- active_data = self.parent().channel_data[0]
5838
- act_channel = 0
5838
+ try:
5839
+ active_data = self.parent().channel_data[0]
5840
+ act_channel = 0
5841
+ except:
5842
+ active_data = self.parent().channel_data[1]
5843
+ act_channel = 1
5839
5844
  else:
5840
5845
  active_data = self.parent().channel_data[1]
5841
5846
  act_channel = 1
@@ -23,7 +23,7 @@ def dilate_3D(tiff_array, dilated_x, dilated_y, dilated_z):
23
23
  Arguments are an array, and the desired pixel dilation amounts in X, Y, Z."""
24
24
 
25
25
  if tiff_array.shape[0] == 1:
26
- return dilate_2D(tiff_array, ((dilated_x - 1) / 2))
26
+ return nettracer.dilate_2D(tiff_array, ((dilated_x - 1) / 2))
27
27
 
28
28
  if dilated_x == 3 and dilated_y == 3 and dilated_z == 3:
29
29
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: nettracer3d
3
- Version: 0.5.0
3
+ Version: 0.5.1
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