Merge branch 'master' into play-with-transitions

pgbovine · pgbovine · commit 5507fa018eb4 · 2012-08-10T22:01:13.000-07:00
Conflicts:
	PyTutorGAE/js/pytutor.js
diff --git a/PyTutorGAE/js/pytutor.js b/PyTutorGAE/js/pytutor.js
@@ -1094,6 +1094,8 @@ ExecutionVisualizer.prototype.precomputeCurTraceLayouts = function() {
 }
 
 
+var heapPtrSrcRE = /__heap_pointer_src_/;
+
 // The "3.0" version of renderDataStructures renders variables in
 // a stack, values in a separate heap, and draws line connectors
 // to represent both stack->heap object references and, more importantly,
@@ -1120,6 +1122,19 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
   // Heap object rendering phase:
 
 
+  // This is VERY crude, but to prevent multiple redundant HEAP->HEAP
+  // connectors from being drawn with the same source and origin, we need to first
+  // DELETE ALL existing HEAP->HEAP connections, and then re-render all of
+  // them in each call to this function. The reason why we can't safely
+  // hold onto them is because there's no way to guarantee that the
+  // *__heap_pointer_src_<src id> IDs are consistent across execution points.
+  myViz.jsPlumbInstance.select().each(function(c) {
+    if (c.sourceId.match(heapPtrSrcRE)) {
+      myViz.jsPlumbInstance.detachAllConnections(c.sourceId);
+    }
+  });
+
+
   // Key:   CSS ID of the div element representing the stack frame variable
   //        (for stack->heap connections) or heap object (for heap->heap connections)
   //        the format is: '<this.visualizerID>__heap_pointer_src_<src id>'
@@ -1318,8 +1333,6 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
 
       var dstDivID = myViz.generateID('heap_object_' + objID);
 
-      // TODO: we might be able to further optimize, since we might be re-drawing
-      // HEAP->HEAP connections when we can just keep the existing ones
       assert(!connectionEndpointIDs.has(srcDivID));
       connectionEndpointIDs.set(srcDivID, dstDivID);
       //console.log('HEAP->HEAP', srcDivID, dstDivID);
@@ -1574,6 +1587,10 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
             var heapObjID = myViz.generateID('heap_object_' + getRefID(val));
             connectionEndpointIDs.set(varDivID, heapObjID);
             //console.log('STACK->HEAP', varDivID, heapObjID);
+
+            // GARBAGE COLLECTION GOTCHA! we need to get rid of the old
+            // connector in preparation for rendering a new one:
+            myViz.jsPlumbInstance.detachAllConnections(varDivID);
           }
 
           //console.log('CHANGED', varname, prevValStringRepr, valStringRepr);
@@ -1717,6 +1734,10 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
             var heapObjID = myViz.generateID('heap_object_' + getRefID(val));
             connectionEndpointIDs.set(varDivID, heapObjID);
             //console.log('STACK->HEAP', varDivID, heapObjID);
+
+            // GARBAGE COLLECTION GOTCHA! we need to get rid of the old
+            // connector in preparation for rendering a new one:
+            myViz.jsPlumbInstance.detachAllConnections(varDivID);
           }
 
           //console.log('CHANGED', frame.unique_hash, varname, prevValStringRepr, valStringRepr);
@@ -1746,9 +1767,12 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
     myViz.jsPlumbInstance.connect({source: varID, target: valueID});
   });
 
+  /*
   myViz.jsPlumbInstance.select().each(function(c) {
-    console.log('CONN', c.sourceId, c.targetId);
+    console.log('CONN:', c.sourceId, c.targetId);
   });
+  */
+  //console.log('---', myViz.jsPlumbInstance.select().length, '---');
 
 
   function highlight_frame(frameID) {
