Changeset 9257:348e625de866 in orange

Timestamp:

11/23/11 20:09:03 (18 months ago)

Author:

miha <miha.stajdohar@…>

Branch:

default

Convert:

41e412ee06b3d0a35d0f538dabc0e37221ca9fa0

Message:

Killed some nasty bugs in recursion.

File:

• orange/OrangeWidgets/Visualize Qt/OWNxCanvasQt.py (modified) (4 diffs)

orange/OrangeWidgets/Visualize Qt/OWNxCanvasQt.py

@@ -610 +610 @@
         current_nodes = self.networkCurve.nodes()
         
+        center_x = numpy.average([node.x() for node in current_nodes.values()]) if len(current_nodes) > 0 else 0
+        center_y = numpy.average([node.y() for node in current_nodes.values()]) if len(current_nodes) > 0 else 0
+        
         def closest_nodes_with_pos(nodes):
             
@@ -617 +620 @@
 
             # checked all, none found            
-            if len(neighbors-nodes) == 0:
+            if len(neighbors - nodes) == 0:
                 return []
             
@@ -624 +627 @@
                 return inter
             else:
-                print "in recursion"
-                return closest_nodes_with_pos(neighbors)
+                return closest_nodes_with_pos(neighbors | nodes)
         
         pos = dict((n, [numpy.average(c) for c in zip(*[(current_nodes[u].x(), current_nodes[u].y()) for u in closest_nodes_with_pos(set([n]))])]) for n in add_nodes)
@@ -631 +633 @@
         self.networkCurve.remove_nodes(list(remove_nodes))
         
-        nodes = dict((v, self.NodeItem(v, x=pos[v][0], y=pos[v][1], parent=self.networkCurve)) for v in add_nodes)
+        nodes = dict((v, self.NodeItem(v, x=pos[v][0] if len(pos[v]) == 2 else center_x, y=pos[v][1] if len(pos[v]) == 2 else center_y, parent=self.networkCurve)) for v in add_nodes)
         self.networkCurve.add_nodes(nodes)
         nodes = self.networkCurve.nodes()