nettracer3d 0.5.6__tar.gz → 0.5.7__tar.gz

{nettracer3d-0.5.6/src/nettracer3d.egg-info → nettracer3d-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nettracer3d
-Version: 0.5.6
+Version: 0.5.7
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <mclaughlinliam99@gmail.com>
 Project-URL: User_Tutorial, https://www.youtube.com/watch?v=cRatn5VTWDY
@@ -44,6 +44,6 @@ NetTracer3D is free to use/fork for academic/nonprofit use so long as citation i
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.5.6 updates --
+-- Version 0.5.7 updates --
 
-1. Minor change - Updated some of the overhead and post-random forrest voxel assignment for the segmenter to be faster. The major bottleneck for this is still querying sklearn which seems a bit harder to work around.
+1. Minor change - Can now export network as .gexf (Gephi), .GraphML, or .net (Pajek) for other network analysis softwares to use.

{nettracer3d-0.5.6 → nettracer3d-0.5.7}/README.md

@@ -8,6 +8,6 @@ NetTracer3D is free to use/fork for academic/nonprofit use so long as citation i
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.5.6 updates --
+-- Version 0.5.7 updates --
 
-1. Minor change - Updated some of the overhead and post-random forrest voxel assignment for the segmenter to be faster. The major bottleneck for this is still querying sklearn which seems a bit harder to work around.
+1. Minor change - Can now export network as .gexf (Gephi), .GraphML, or .net (Pajek) for other network analysis softwares to use.

{nettracer3d-0.5.6 → nettracer3d-0.5.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nettracer3d"
-version = "0.5.6"
+version = "0.5.7"
 authors = [
   { name="Liam McLaughlin", email="mclaughlinliam99@gmail.com" },
 ]

{nettracer3d-0.5.6 → nettracer3d-0.5.7}/src/nettracer3d/nettracer_gui.py

@@ -3980,10 +3980,17 @@ class CustomTableView(QTableView):
                 save_menu = context_menu.addMenu("Save As")
                 save_csv = save_menu.addAction("CSV")
                 save_excel = save_menu.addAction("Excel")
+                save_gephi = save_menu.addAction("Gephi")
+                save_graphml = save_menu.addAction("GraphML")
+                save_pajek = save_menu.addAction("Pajek")
                 
                 # Connect the actions - ensure we're saving the active table
                 save_csv.triggered.connect(lambda: self.parent.active_table.save_table_as('csv'))
                 save_excel.triggered.connect(lambda: self.parent.active_table.save_table_as('xlsx'))
+                save_gephi.triggered.connect(lambda: self.parent.active_table.save_table_as('gexf'))
+                save_graphml.triggered.connect(lambda: self.parent.active_table.save_table_as('graphml'))
+                save_pajek.triggered.connect(lambda: self.parent.active_table.save_table_as('net'))
+
 
                 if self == self.parent.selection_table:
                     set_action = context_menu.addAction("Swap with network table (also sets internal network properties - may affect related functions)")
@@ -4061,14 +4068,19 @@ class CustomTableView(QTableView):
             table_name = "Selection"
         
         # Get save file name
-        file_filter = "CSV Files (*.csv)" if file_type == 'csv' else "Excel Files (*.xlsx)"
+        file_filter = ("CSV Files (*.csv)" if file_type == 'csv' else 
+                      "Excel Files (*.xlsx)" if file_type == 'excel' else 
+                      "Gephi Graph (*.gexf)" if file_type == 'gexf' else
+                      "GraphML (*.graphml)" if file_type == 'graphml' else
+                      "Pajek Network (*.net)")
+
         filename, _ = QFileDialog.getSaveFileName(
             self,
             f"Save {table_name} Table As",
             "",
             file_filter
         )
-        
+
         if filename:
             try:
                 if file_type == 'csv':
@@ -4076,11 +4088,28 @@ class CustomTableView(QTableView):
                     if not filename.endswith('.csv'):
                         filename += '.csv'
                     df.to_csv(filename, index=False)
-                else:
+                elif file_type == 'xlsx':
                     # If user didn't type extension, add .xlsx
                     if not filename.endswith('.xlsx'):
                         filename += '.xlsx'
                     df.to_excel(filename, index=False)
+                elif file_type == 'gexf':
+                    # If user didn't type extension, add .gexf
+                    if not filename.endswith('.gexf'):
+                        filename += '.gexf'
+                    #for node in my_network.network.nodes():
+                        #my_network.network.nodes[node]['label'] = str(node)
+                    nx.write_gexf(my_network.network, filename, encoding='utf-8', prettyprint=True)
+                elif file_type == 'graphml':
+                    # If user didn't type extension, add .graphml
+                    if not filename.endswith('.graphml'):
+                        filename += '.graphml'
+                    nx.write_graphml(my_network.network, filename)
+                elif file_type == 'net':
+                    # If user didn't type extension, add .net
+                    if not filename.endswith('.net'):
+                        filename += '.net'
+                    nx.write_pajek(my_network.network, filename)
                     
                 QMessageBox.information(
                     self,

{nettracer3d-0.5.6 → nettracer3d-0.5.7/src/nettracer3d.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nettracer3d
-Version: 0.5.6
+Version: 0.5.7
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <mclaughlinliam99@gmail.com>
 Project-URL: User_Tutorial, https://www.youtube.com/watch?v=cRatn5VTWDY
@@ -44,6 +44,6 @@ NetTracer3D is free to use/fork for academic/nonprofit use so long as citation i
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.5.6 updates --
+-- Version 0.5.7 updates --
 
-1. Minor change - Updated some of the overhead and post-random forrest voxel assignment for the segmenter to be faster. The major bottleneck for this is still querying sklearn which seems a bit harder to work around.
+1. Minor change - Can now export network as .gexf (Gephi), .GraphML, or .net (Pajek) for other network analysis softwares to use.