traub 2005 gui: switched to networkx for drawing morphology

The first choice is graphviz twopi for layout.
If that does not exist, spectral layout is the best
that networkx provides.

Author: subhacom

traub_2005/py/gui.py

@@ -6,9 +6,9 @@
 # Maintainer: 
 # Created: Fri Jul 12 11:53:50 2013 (+0530)
 # Version: 
-# Last-Updated: Thu Aug 11 11:59:17 2016 (-0400)
+# Last-Updated: Thu Aug 11 17:21:24 2016 (-0400)
 #           By: Subhasis Ray
-#     Update #: 746
+#     Update #: 781
 # URL: 
 # Keywords: 
 # Compatibility: 
@@ -194,43 +194,13 @@ def displayGraph(self, g, label=False):
         if len(sizes) == 0:
             print('Empty graph for cell. Make sure proto file has `*asymmetric` on top. I cannot handle symmetric compartmental connections')
             return
-        weights = np.array([g.edge[e[0]][e[1]]['weight'] for e in g.edges()])
-        try:
-            pos = nx.graphviz_layout(g, prog='twopi')
-        except (NameError, AttributeError) as e:
-            pos = nx.spectral_layout(g)
-        xmin, ymin, xmax, ymax = 1e9, 1e9, -1e9, -1e9
-        for p in pos.values():
-            if xmin > p[0]:
-                xmin = p[0]
-            if xmax < p[0]:
-                xmax = p[0]
-            if ymin > p[1]:
-                ymin = p[1]
-            if ymax < p[1]:
-                ymax = p[1]        
-        edge_widths = 10.0 * weights / max(weights)
         node_colors = ['k' if x in axon else 'gray' for x in g.nodes()]
         lw = [1 if n.endswith('comp_1') else 0 for n in g.nodes()]
-        print('Edge widths:', edge_widths)
         self.axes.clear()
-        self.axes.set_xlim((xmin-10, xmax+10))
-        self.axes.set_ylim((ymin-10, ymax+10))
-        for ii, e in enumerate(g.edges()):
-            p0 = pos[e[0]]
-            p1 = pos[e[1]]
-            a = patches.FancyArrow(p0[0], p0[1], p1[0] - p0[0], p1[1] - p0[1], width=edge_widths[ii], head_width=0.0, axes=self.axes, ec='none', fc='black')
-            self.axes.add_patch(a)
-        for ii, n in enumerate(g.nodes()):
-            if n in axon:
-                ec = 'black'
-            elif n.endswith('comp_1'):
-                ec = 'red'
-            else:
-                ec = 'none'                
-            c = patches.Circle(pos[n], radius=sizes[ii], axes=self.axes, ec=ec, fc='gray', alpha=0.8)
-            self.axes.add_patch(c)
-        self.canvas.draw()
+        try:
+            nx.draw_graphviz(g, ax=self.axes, prog='twopi', node_color=node_colors, lw=lw)
+        except (NameError, AttributeError) as e:
+            nx.draw_spectral(g, ax=self.axes, node_color=node_colors, lw=lw, with_labels=False, )
 
 
 class CellView(QtGui.QWidget):