nettracer3d 0.9.9__tar.gz → 1.0.0__tar.gz

{nettracer3d-0.9.9/src/nettracer3d.egg-info → nettracer3d-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.9
+Version: 1.0.0
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <liamm@wustl.edu>
 Project-URL: Documentation, https://nettracer3d.readthedocs.io/en/latest/
@@ -110,7 +110,7 @@ McLaughlin, L., Zhang, B., Sharma, S. et al. Three dimensional multiscalar neuro
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.9.9 Updates --
+-- Version 1.0.0 Updates --
 
-	* Tables can now be opened to the rightside upper widget if they are the right format.
-	* Similarly, tables that have the format node id column:numerical values can now be used liberally to threshold the nodes, meaning most outputs of network analysis can be used to threshold nodes.
+	* The 'network selection' table is now auto-populated when using the multiple-identity selector, and when using the node thresholder.
+	* And other minor adjustments/bug fixes

{nettracer3d-0.9.9 → nettracer3d-1.0.0}/README.md

@@ -65,7 +65,7 @@ McLaughlin, L., Zhang, B., Sharma, S. et al. Three dimensional multiscalar neuro
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.9.9 Updates --
+-- Version 1.0.0 Updates --
 
-	* Tables can now be opened to the rightside upper widget if they are the right format.
-	* Similarly, tables that have the format node id column:numerical values can now be used liberally to threshold the nodes, meaning most outputs of network analysis can be used to threshold nodes.
+	* The 'network selection' table is now auto-populated when using the multiple-identity selector, and when using the node thresholder.
+	* And other minor adjustments/bug fixes

{nettracer3d-0.9.9 → nettracer3d-1.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nettracer3d"
-version = "0.9.9"
+version = "1.0.0"
 authors = [
   { name="Liam McLaughlin", email="liamm@wustl.edu" },
 ]

{nettracer3d-0.9.9 → nettracer3d-1.0.0}/src/nettracer3d/nettracer_gui.py

@@ -1027,7 +1027,6 @@ class ImageViewerWindow(QMainWindow):
 
         """Highlight overlay generation method specific for the segmenter interactive mode"""
 
-
         def process_chunk_bounds(chunk_data, indices_to_check):
             """Process a single chunk of the array to create highlight mask"""
             mask = (chunk_data >= indices_to_check[0]) & (chunk_data <= indices_to_check[1])
@@ -1106,6 +1105,30 @@ class ImageViewerWindow(QMainWindow):
             current_ylim = self.ax.get_ylim()
             self.update_display_pan_mode(current_xlim, current_ylim)
 
+        if my_network.network is not None:
+            try:
+                if self.active_channel == 0:
+
+                    # Get the existing DataFrame from the model
+                    original_df = self.network_table.model()._data
+                    
+                    # Create mask for rows where one column is any original node AND the other column is any neighbor
+                    mask = (
+                        (original_df.iloc[:, 0].isin(indices)) &
+                        (original_df.iloc[:, 1].isin(indices)))
+                    
+                    # Filter the DataFrame to only include direct connections
+                    filtered_df = original_df[mask].copy()
+                    
+                    # Create new model with filtered DataFrame and update selection table
+                    new_model = PandasModel(filtered_df)
+                    self.selection_table.setModel(new_model)
+                    
+                    # Switch to selection table
+                    self.selection_button.click()
+            except:
+                pass
+
 
 
     def create_mini_overlay(self, node_indices = None, edge_indices = None):
@@ -3968,6 +3991,30 @@ class ImageViewerWindow(QMainWindow):
                         if len(self.clicked_values['edges']):
                             self.highlight_value_in_tables(self.clicked_values['edges'][-1])
                             self.handle_info('edge')
+
+                    if len(self.clicked_values['nodes']) > 0 or len(self.clicked_values['edges']) > 0:  # Check if we have any nodes selected
+
+                        old_nodes = copy.deepcopy(self.clicked_values['nodes']) 
+
+                        # Get the existing DataFrame from the model
+                        original_df = self.network_table.model()._data
+                        
+                        # Create mask for rows where one column is any original node AND the other column is any neighbor
+                        mask = (
+                            ((original_df.iloc[:, 0].isin(self.clicked_values['nodes'])) &
+                            (original_df.iloc[:, 1].isin(self.clicked_values['nodes']))) |
+                            (original_df.iloc[:, 2].isin(self.clicked_values['edges']))
+                            )
+                        
+                        # Filter the DataFrame to only include direct connections
+                        filtered_df = original_df[mask].copy()
+                        
+                        # Create new model with filtered DataFrame and update selection table
+                        new_model = PandasModel(filtered_df)
+                        self.selection_table.setModel(new_model)
+                        
+                        # Switch to selection table
+                        self.selection_button.click()
             
             elif not self.selecting and self.selection_start:  # If we had a click but never started selection
                 # Handle as a normal click
@@ -4514,7 +4561,7 @@ class ImageViewerWindow(QMainWindow):
         
         
         # Add after your other buttons
-        self.popup_button = QPushButton("⤴")  # or "🔗" or "⤴"
+        self.popup_button = QPushButton("⤴") 
         self.popup_button.setFixedSize(40, 40)
         self.popup_button.setToolTip("Pop out canvas")
         self.popup_button.clicked.connect(self.popup_canvas)
@@ -6175,8 +6222,6 @@ class ImageViewerWindow(QMainWindow):
                 if self.resume:
                     self.machine_window.segmentation_worker.resume()
                     self.resume = False
-                if self.prev_down != self.downsample_factor:
-                    self.validate_downsample_input(text = self.prev_down)
            
             if self.static_background is not None:
                 # Your existing virtual strokes conversion logic
@@ -6233,8 +6278,6 @@ class ImageViewerWindow(QMainWindow):
                 for img in list(self.ax.get_images()):
                     img.remove()
                 # Clear measurement points
-                for artist in self.measurement_artists:
-                    artist.remove()
                 self.measurement_artists.clear()
 
             # Determine the current view bounds (either from preserve_zoom or current state)
@@ -6449,9 +6492,10 @@ class ImageViewerWindow(QMainWindow):
             if reset_resize:
                 self.resizing = False
             
-            # Use draw_idle for better performance
+            # draw_idle
             self.canvas.draw_idle()
 
+
         except Exception as e:
             pass
             #import traceback
@@ -13108,7 +13152,7 @@ class GenNodesDialog(QDialog):
 
             if my_network.edges is None and my_network.nodes is not None:
                 self.parent().load_channel(1, my_network.nodes, data = True)
-                self.parent().delete_channel(0, True)
+                self.parent().delete_channel(0, False)
             # Get directory (None if empty)
             #directory = self.directory.text() if self.directory.text() else None
             
@@ -13340,7 +13384,7 @@ class BranchDialog(QDialog):
 
             if my_network.edges is None and my_network.nodes is not None:
                 self.parent().load_channel(1, my_network.nodes, data = True)
-                self.parent().delete_channel(0, True)
+                self.parent().delete_channel(0, False)
 
             original_shape = my_network.edges.shape
             original_array = copy.deepcopy(my_network.edges)

{nettracer3d-0.9.9 → nettracer3d-1.0.0/src/nettracer3d.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.9
+Version: 1.0.0
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <liamm@wustl.edu>
 Project-URL: Documentation, https://nettracer3d.readthedocs.io/en/latest/
@@ -110,7 +110,7 @@ McLaughlin, L., Zhang, B., Sharma, S. et al. Three dimensional multiscalar neuro
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.9.9 Updates --
+-- Version 1.0.0 Updates --
 
-	* Tables can now be opened to the rightside upper widget if they are the right format.
-	* Similarly, tables that have the format node id column:numerical values can now be used liberally to threshold the nodes, meaning most outputs of network analysis can be used to threshold nodes.
+	* The 'network selection' table is now auto-populated when using the multiple-identity selector, and when using the node thresholder.
+	* And other minor adjustments/bug fixes