nettracer3d 0.9.8__tar.gz → 0.9.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.8
+Version: 0.9.9
 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,6 +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.8 Updates --
+-- Version 0.9.9 Updates --
 
-	* Some minor bug fixes
+	* 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.

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

@@ -65,6 +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.8 Updates --
+-- Version 0.9.9 Updates --
 
-	* Some minor bug fixes
+	* 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.

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

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

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

@@ -466,6 +466,102 @@ class ImageViewerWindow(QMainWindow):
         self.hold_update = False
         self._first_pan_done = False
 
+
+    def load_file(self):
+        """Load CSV or Excel file and convert to dictionary format."""
+        try:
+            # Open file dialog
+            file_filter = "Spreadsheet Files (*.csv *.xlsx);;CSV Files (*.csv);;Excel Files (*.xlsx)"
+            filename, _ = QFileDialog.getOpenFileName(
+                self,
+                "Load File",
+                "",
+                file_filter
+            )
+            
+            if not filename:
+                return
+            
+            # Read the file
+            if filename.endswith('.csv'):
+                df = pd.read_csv(filename)
+            elif filename.endswith('.xlsx'):
+                df = pd.read_excel(filename)
+            else:
+                QMessageBox.warning(self, "Error", "Please select a CSV or Excel file.")
+                return
+            
+            if df.empty:
+                QMessageBox.warning(self, "Error", "The file appears to be empty.")
+                return
+            
+            # Extract headers
+            headers = df.columns.tolist()
+            if len(headers) < 1:
+                QMessageBox.warning(self, "Error", "File must have at least 1 column.")
+                return
+            
+            # Extract filename without extension for title
+            import os
+            title = os.path.splitext(os.path.basename(filename))[0]
+            
+            if len(headers) == 1:
+                # Single column: pass header to metric, column data as list to data, nothing to value
+                metric = headers[0]
+                data = df.iloc[:, 0].tolist()  # First column as list
+                value = None
+                
+                self.format_for_upperright_table(
+                    data=data,
+                    metric=metric,
+                    value=value,
+                    title=title
+                )
+            else:
+                # Multiple columns: create dictionary as before
+                # First column header (for metric parameter)
+                metric = headers[0]
+                
+                # Remaining headers (for value parameter)
+                value = headers[1:]
+                
+                # Create dictionary
+                data_dict = {}
+                
+                for index, row in df.iterrows():
+                    key = row.iloc[0]  # First column value as key
+                    
+                    if len(headers) == 2:
+                        # If only 2 columns, store single value
+                        data_dict[key] = row.iloc[1]
+                    else:
+                        # If more than 2 columns, store as list
+                        data_dict[key] = row.iloc[1:].tolist()
+                
+                if len(value) == 1:
+                    value = value[0]
+                
+                # Call the parent method
+                self.format_for_upperright_table(
+                    data=data_dict,
+                    metric=metric,
+                    value=value,
+                    title=title
+                )
+            
+            QMessageBox.information(
+                self,
+                "Success",
+                f"File '{title}' loaded successfully with {len(df)} entries."
+            )
+            
+        except Exception as e:
+            QMessageBox.critical(
+                self,
+                "Error",
+                f"Failed to load file: {str(e)}"
+            )
+        
     def popup_canvas(self):
         """Pop the canvas out into its own window"""
         if hasattr(self, 'popup_window') and self.popup_window.isVisible():
@@ -4433,6 +4529,12 @@ class ImageViewerWindow(QMainWindow):
         cam_button.setStyleSheet("font-size: 24px;")
         cam_button.clicked.connect(self.snap)
         corner_layout.addWidget(cam_button)
+
+        load_button = QPushButton("📁")
+        load_button.setFixedSize(40, 40)
+        load_button.setStyleSheet("font-size: 24px;")
+        load_button.clicked.connect(self.load_file)
+        corner_layout.addWidget(load_button)
         
         # Set as corner widget
         menubar.setCornerWidget(corner_widget, Qt.Corner.TopRightCorner)
@@ -6655,15 +6757,19 @@ class CustomTableView(QTableView):
                     desc_action.triggered.connect(lambda checked, c=col: self.sort_table(c, ascending=False))
             
             # Different menus for top and bottom tables
-            if self in self.parent.data_table:  # Top table
+            if self.is_top_table:  # Use the flag instead of checking membership
                 save_menu = context_menu.addMenu("Save As")
                 save_csv = save_menu.addAction("CSV")
                 save_excel = save_menu.addAction("Excel")
+                
+                if self.model() and len(self.model()._data.columns) == 2:
+                    thresh_action = context_menu.addAction("Use to Threshold Nodes")
+                    thresh_action.triggered.connect(lambda: self.thresh(self.create_threshold_dict()))
+                
                 close_action = context_menu.addAction("Close All")
-
                 close_action.triggered.connect(self.close_all)
                 
-                # Connect the actions
+                # Connect the save actions
                 save_csv.triggered.connect(lambda: self.save_table_as('csv'))
                 save_excel.triggered.connect(lambda: self.save_table_as('xlsx'))
             else:  # Bottom tables
@@ -6707,6 +6813,38 @@ class CustomTableView(QTableView):
             cursor_pos = QCursor.pos()
             context_menu.exec(cursor_pos)
 
+
+
+    def thresh(self, special_dict):
+        try:
+            self.parent.special_dict = special_dict
+            thresh_window = ThresholdWindow(self.parent, 4)
+            thresh_window.show()
+        except:
+            pass
+
+    def create_threshold_dict(self):
+        try:
+            """Create a dictionary from the 2-column table data."""
+            if not self.model() or not hasattr(self.model(), '_data'):
+                return {}
+            
+            df = self.model()._data
+            if len(df.columns) != 2:
+                return {}
+            
+            # Create dictionary: {column_0_value: column_1_value}
+            threshold_dict = {}
+            for index, row in df.iterrows():
+                key = row.iloc[0]    # Column 0 value
+                value = row.iloc[1]  # Column 1 value
+                threshold_dict[int(key)] = float(value)
+            
+            return threshold_dict
+        except:
+            pass
+
+
     def sort_table(self, column, ascending=True):
         """Sort the table by the specified column."""
         try:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.8
+Version: 0.9.9
 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,6 +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.8 Updates --
+-- Version 0.9.9 Updates --
 
-	* Some minor bug fixes
+	* 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.