Merge branch 'master' of github.com:benmaier/netwulf

benmaier · Apr 10, 2019 · 2dd26be · 2dd26be
2 parents 71006ce + 94c400d
commit 2dd26be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/netwulf/interactive.py b/netwulf/interactive.py
@@ -272,9 +272,11 @@ def visualize(network,
     try:
         while not server.end_requested:
             time.sleep(0.1)
+        is_keyboard_interrupted = False
     except KeyboardInterrupt:
+        is_keyboard_interrupted = True
         pass
-
+    
     server.end_requested = True
 
     if verbose:
@@ -299,10 +301,9 @@ def visualize(network,
         # apparently this is how it has to be on Windows
         is_jupyter = 'JPY_PARENT_PID' in env
 
-    if is_jupyter:
+    if is_jupyter and not is_keyboard_interrupted:
         fig, ax = wulf.draw_netwulf(posted_network_properties)
 
-
     return posted_network_properties, posted_config
 
 

diff --git a/netwulf/tools.py b/netwulf/tools.py
@@ -22,8 +22,8 @@ def bind_positions_to_network(network, network_properties):
         interactive visualization.
     """
 
-    x =  { node['id']: node['pos'][0] for node in network_properties['nodes'] }
-    y =  { node['id']: node['pos'][1] for node in network_properties['nodes'] }
+    x = { node['id']: node['x'] for node in network_properties['nodes'] }
+    y = { node['id']: node['y'] for node in network_properties['nodes'] }
     nx.set_node_attributes(network, x, 'x')
     nx.set_node_attributes(network, y, 'y')
 
@@ -78,8 +78,8 @@ def draw_netwulf(network_properties, fig=None, ax=None, figsize=None):
     .. code:: python
 
         ax.text(
-                network_properties['nodes'][0]['pos'][0],
-                network_properties['nodes'][0]['pos'][1],
+                network_properties['nodes'][0]['x'],
+                network_properties['nodes'][0]['y'],
                 network_properties['nodes'][0]['id']
                )
 
@@ -144,15 +144,15 @@ def draw_netwulf(network_properties, fig=None, ax=None, figsize=None):
 
     # filter out node positions for links
     width = network_properties['xlim'][1] - network_properties['xlim'][0]
-    pos = { node['id']: np.array(node['pos']) for node in network_properties['nodes'] }
+    pos = { node['id']: np.array([node['x'], node['y']]) for node in network_properties['nodes'] }
 
     lines = []
     linewidths = []
     for link in network_properties['links']:
         u, v = link['link']
         lines.append([ 
-                        [pos[u][0],pos[v][0]], 
-                        [pos[u][1],pos[v][1]]
+            [pos[u][0], pos[v][0]], 
+            [pos[u][1], pos[v][1]]
                      ])
         linewidths.append(link['width']/width*axwidth)
 
@@ -175,7 +175,7 @@ def draw_netwulf(network_properties, fig=None, ax=None, figsize=None):
     node_colors = []
 
     for node in network_properties['nodes']:
-        XY.append( node['pos'] )
+        XY.append([node['x'], node['y']])
         # size has to be given in points**2
         size.append( 2*node['radius'] )
         node_colors.append(node['color'])