nettracer3d 0.9.2__py3-none-any.whl → 0.9.3__py3-none-any.whl

nettracer3d/nettracer.py

@@ -5585,7 +5585,10 @@ class Network_3D:
             if self.communities is not None and label == 2:
                 neighbor_group = {}
                 for node, com in self.communities.items():
-                    neighbor_group[com] = neighbors[node]
+                    try:
+                        neighbor_group[com] = neighbors[node]
+                    except:
+                        neighbor_group[com] = 0
                 neighborhoods.visualize_cluster_composition_umap(umap_dict, id_set, neighborhoods = neighbor_group)
             elif label == 1:
                 neighborhoods.visualize_cluster_composition_umap(umap_dict, id_set, label = True) 

nettracer3d/nettracer_gui.py

@@ -4542,6 +4542,10 @@ class ImageViewerWindow(QMainWindow):
                 if not self.confirm_calcbranch_dialog("Use of this feature will require additional use of the Nodes and Overlay 2 channels. Please save any data and return, or proceed if you do not need those channels' data"):
                     return
 
+            if my_network.edges is None and my_network.nodes is not None:
+                self.load_channel(1, my_network.nodes, data = True)
+                self.delete_channel(0, False)
+
             my_network.id_overlay = my_network.edges.copy()
 
             self.show_gennodes_dialog()
@@ -4574,6 +4578,10 @@ class ImageViewerWindow(QMainWindow):
                 if not self.confirm_calcbranch_dialog("Use of this feature will require additional use of the Nodes and Overlay 2 channels. Please save any data and return, or proceed if you do not need those channels' data"):
                     return
 
+            if my_network.edges is None and my_network.nodes is not None:
+                self.load_channel(1, my_network.nodes, data = True)
+                self.delete_channel(0, False)
+
             self.show_branch_dialog(called = True)
 
             self.load_channel(0, my_network.edges, data = True)
@@ -12453,6 +12461,10 @@ class GenNodesDialog(QDialog):
     def run_gennodes(self):
 
         try:
+
+            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)
             # Get directory (None if empty)
             #directory = self.directory.text() if self.directory.text() else None
             
@@ -12682,6 +12694,10 @@ class BranchDialog(QDialog):
             fix_val = float(self.fix_val.text()) if self.fix_val.text() else None
             seed = int(self.seed.text()) if self.seed.text() else None
 
+            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)
+
             original_shape = my_network.edges.shape
             original_array = copy.deepcopy(my_network.edges)
 

{nettracer3d-0.9.2.dist-info → nettracer3d-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.2
+Version: 0.9.3
 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,8 +110,6 @@ 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.2 Updates --
-	* Image viewer canvas window can now be popped out into a separate window.
-	* Image pyramid calculation is more dynamic instead of using arbitrary size thresholds.
-	* Adjusted pan mode
-	* Some bug fixes.
+-- Version 0.9.3 Updates --
+
+	* Some minor bug fixes.

{nettracer3d-0.9.2.dist-info → nettracer3d-0.9.3.dist-info}/RECORD

@@ -5,8 +5,8 @@ nettracer3d/excelotron.py,sha256=X9v_mte8gJBPNGdj6NJNUYja0Z6eorVoKAFx4nHiMnU,720
 nettracer3d/modularity.py,sha256=pborVcDBvICB2-g8lNoSVZbIReIBlfeBmjFbPYmtq7Y,22443
 nettracer3d/morphology.py,sha256=jyDjYzrZ4LvI5jOyw8DLsxmo-i5lpqHsejYpW7Tq7Mo,19786
 nettracer3d/neighborhoods.py,sha256=iIaHU1COIdRtzRpAuIQKfLGLNKYFK3dL8Vb_EeJIlEA,46459
-nettracer3d/nettracer.py,sha256=PBlvgCI65pwhMjTBuDl5CnHtv7unU8PMkyGt3Mz_a30,264443
-nettracer3d/nettracer_gui.py,sha256=RBmt--IhiUWlHy0CI_DK6GEXEREWZyQcF7FNdrUK2WA,600327
+nettracer3d/nettracer.py,sha256=KTVodpVpu2mfzdRR-ZucZlTQCZc1pqgH4jAI26vWAgY,264551
+nettracer3d/nettracer_gui.py,sha256=eZuO9v9szm-pj_-Bl71Lyg0mw80u_HJragARR2muVLo,601133
 nettracer3d/network_analysis.py,sha256=kBzsVaq4dZkMe0k-VGvQIUvM-tK0ZZ8bvb-wtsugZRQ,46150
 nettracer3d/network_draw.py,sha256=F7fw6Pcf4qWOhdKwLmhwqWdschbDlHzwCVolQC9imeU,14117
 nettracer3d/node_draw.py,sha256=kZcR1PekLg0riioNeGcALIXQyZ5PtHA_9MT6z7Zovdk,10401
@@ -17,9 +17,9 @@ nettracer3d/segmenter.py,sha256=-Llkhp3TlAIBXZNhcfMFQRdg0vec1xtlOm0c4_bSU9U,7576
 nettracer3d/segmenter_GPU.py,sha256=optCZ_zLIfe99rgqmyKWUZlWW5TF5jEC_C3keu1m7VQ,77771
 nettracer3d/simple_network.py,sha256=dkG4jpc4zzdeuoaQobgGfL3PNo6N8dGKQ5hEEubFIvA,9947
 nettracer3d/smart_dilate.py,sha256=TvRUh6B4q4zIdCO1BWH-xgTdND5OUNmo99eyxG9oIAU,27145
-nettracer3d-0.9.2.dist-info/licenses/LICENSE,sha256=jnNT-yBeIAKAHpYthPvLeqCzJ6nSurgnKmloVnfsjCI,764
-nettracer3d-0.9.2.dist-info/METADATA,sha256=4lxrFb_E22_2wXMY7mW32K2VvG8OJS2l5s2kJeHOd6w,7179
-nettracer3d-0.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nettracer3d-0.9.2.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
-nettracer3d-0.9.2.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
-nettracer3d-0.9.2.dist-info/RECORD,,
+nettracer3d-0.9.3.dist-info/licenses/LICENSE,sha256=jnNT-yBeIAKAHpYthPvLeqCzJ6nSurgnKmloVnfsjCI,764
+nettracer3d-0.9.3.dist-info/METADATA,sha256=lfHt7f_M_votMYdihCuZWBmL4jUCV6YXrN7PFu7iEkQ,6998
+nettracer3d-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nettracer3d-0.9.3.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
+nettracer3d-0.9.3.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
+nettracer3d-0.9.3.dist-info/RECORD,,