nettracer3d 0.4.9__tar.gz → 0.5.1__tar.gz

{nettracer3d-0.4.9/src/nettracer3d.egg-info → nettracer3d-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nettracer3d
-Version: 0.4.9
+Version: 0.5.1
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <boom2449@gmail.com>
 Project-URL: User_Manual, https://drive.google.com/drive/folders/1fTkz3n4LN9_VxKRKC8lVQSlrz_wq0bVn?usp=drive_link

{nettracer3d-0.4.9 → nettracer3d-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nettracer3d"
-version = "0.4.9"
+version = "0.5.1"
 authors = [
   { name="Liam McLaughlin", email="boom2449@gmail.com" },
 ]

{nettracer3d-0.4.9 → nettracer3d-0.5.1}/src/nettracer3d/nettracer_gui.py

@@ -1300,11 +1300,12 @@ class ImageViewerWindow(QMainWindow):
                 my_network.nodes = my_network.nodes * mask
                 self.load_channel(0, my_network.nodes, True)
 
-                for i in range(len(my_network.network_lists[0]) - 1, -1, -1):
-                    if my_network.network_lists[0][i] in self.clicked_values['nodes'] or my_network.network_lists[0][i] in self.clicked_values['nodes']:
-                        del my_network.network_lists[0][i]
-                        del my_network.network_lists[1][i]
-                        del my_network.network_lists[2][i]
+                if my_network.network_lists is not None:
+                    for i in range(len(my_network.network_lists[0]) - 1, -1, -1):
+                        if my_network.network_lists[0][i] in self.clicked_values['nodes'] or my_network.network_lists[0][i] in self.clicked_values['nodes']:
+                            del my_network.network_lists[0][i]
+                            del my_network.network_lists[1][i]
+                            del my_network.network_lists[2][i]
 
 
 
@@ -1314,11 +1315,12 @@ class ImageViewerWindow(QMainWindow):
                 my_network.edges = my_network.edges * mask
                 self.load_channel(1, my_network.edges, True)
 
-                for i in range(len(my_network.network_lists[1]) - 1, -1, -1):
-                    if my_network.network_lists[2][i] in self.clicked_values['edges']:
-                        del my_network.network_lists[0][i]
-                        del my_network.network_lists[1][i]
-                        del my_network.network_lists[2][i]
+                if my_network.network_lists is not None:
+                    for i in range(len(my_network.network_lists[1]) - 1, -1, -1):
+                        if my_network.network_lists[2][i] in self.clicked_values['edges']:
+                            del my_network.network_lists[0][i]
+                            del my_network.network_lists[1][i]
+                            del my_network.network_lists[2][i]
 
             my_network.network_lists = my_network.network_lists
 
@@ -2063,18 +2065,19 @@ class ImageViewerWindow(QMainWindow):
                     x_idx = int(round(event.xdata))
                     y_idx = int(round(event.ydata))
                     # Check if Ctrl key is pressed (using matplotlib's key_press system)
-                    ctrl_pressed = 'ctrl' in event.modifiers  
-                    if self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx] != 0:
-                        clicked_value = self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx]
-                    else:
-                        if not ctrl_pressed:
-                            self.clicked_values = {
-                                'nodes': [],
-                                'edges': []
-                            }
-                            self.create_highlight_overlay()
-                        return
-                    
+                    ctrl_pressed = 'ctrl' in event.modifiers
+                    if len(self.channel_data[self.active_channel].shape) != 4:  
+                        if self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx] != 0:
+                            clicked_value = self.channel_data[self.active_channel][self.current_slice, y_idx, x_idx]
+                        else:
+                            if not ctrl_pressed:
+                                self.clicked_values = {
+                                    'nodes': [],
+                                    'edges': []
+                                }
+                                self.create_highlight_overlay()
+                            return
+                        
 
                     starting_vals = copy.deepcopy(self.clicked_values)
                     
@@ -5832,8 +5835,12 @@ class MachineWindow(QMainWindow):
 
         if self.parent().active_channel == 0:
             if self.parent().channel_data[0] is not None:
-                active_data = self.parent().channel_data[0]
-                act_channel = 0
+                try:
+                    active_data = self.parent().channel_data[0]
+                    act_channel = 0
+                except:
+                    active_data = self.parent().channel_data[1]
+                    act_channel = 1
             else:
                 active_data = self.parent().channel_data[1]
                 act_channel = 1
@@ -7347,6 +7354,13 @@ class BranchDialog(QDialog):
         run_button.clicked.connect(self.branch_label)
         layout.addRow(run_button)
 
+        if self.parent().channel_data[0] is not None:
+            QMessageBox.critical(
+                self,
+                "Alert",
+                "The nodes channel will be intermittently overwritten when running this method"
+            )
+
     def branch_label(self):
 
         try:

{nettracer3d-0.4.9 → nettracer3d-0.5.1}/src/nettracer3d/smart_dilate.py

@@ -23,7 +23,7 @@ def dilate_3D(tiff_array, dilated_x, dilated_y, dilated_z):
     Arguments are an array,  and the desired pixel dilation amounts in X, Y, Z."""
 
     if tiff_array.shape[0] == 1:
-        return dilate_2D(tiff_array, ((dilated_x - 1) / 2))
+        return nettracer.dilate_2D(tiff_array, ((dilated_x - 1) / 2))
 
     if dilated_x == 3 and dilated_y == 3  and dilated_z == 3:
 

{nettracer3d-0.4.9 → nettracer3d-0.5.1/src/nettracer3d.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nettracer3d
-Version: 0.4.9
+Version: 0.5.1
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <boom2449@gmail.com>
 Project-URL: User_Manual, https://drive.google.com/drive/folders/1fTkz3n4LN9_VxKRKC8lVQSlrz_wq0bVn?usp=drive_link