some subtle renamings

pgbovine · pgbovine · commit 2133ac8cf984 · 2012-08-05T22:18:30.000-07:00
diff --git a/PyTutorGAE/js/edu-python-tutor.js b/PyTutorGAE/js/edu-python-tutor.js
@@ -34,15 +34,35 @@ function enterEditMode() {
   $.bbq.pushState({ mode: 'edit' }, 2 /* completely override other hash strings to keep URL clean */);
 }
 
-function enterVisualizeMode(traceData, inputCode) {
+function preprocessBackendResult(traceData, inputCode) {
   // set gross globals, then let jQuery BBQ take care of the rest
   curTrace = traceData;
   curInputCode = inputCode;
 
-  precomputeCurTraceLayouts(); // bam!
-
   renderPyCodeOutput(inputCode);
 
+
+  // must postprocess traceData prior to running precomputeCurTraceLayouts() ...
+  var lastEntry = curTrace[curTrace.length - 1];
+
+  // GLOBAL!
+  instrLimitReached = (lastEntry.event == 'instruction_limit_reached');
+
+  if (instrLimitReached) {
+    curTrace.pop() // kill last entry
+    var warningMsg = lastEntry.exception_msg;
+    $("#errorOutput").html(htmlspecialchars(warningMsg));
+    $("#errorOutput").show();
+  }
+  // as imran suggests, for a (non-error) one-liner, SNIP off the
+  // first instruction so that we start after the FIRST instruction
+  // has been executed ...
+  else if (curTrace.length == 2) {
+    curTrace.shift();
+  }
+
+  precomputeCurTraceLayouts(); // bam!
+
   $.bbq.pushState({ mode: 'visualize' }, 2 /* completely override other hash strings to keep URL clean */);
 }
 
@@ -113,7 +133,7 @@ $(document).ready(function() {
 
       // do this AFTER making #pyOutputPane visible, or else
       // jsPlumb connectors won't render properly
-      processTrace(false);
+      enterVisualizeMode(false);
     }
     else {
       assert(false);
@@ -159,7 +179,7 @@ $(document).ready(function() {
               $('#executeBtn').attr('disabled', false);
             }
             else {
-              enterVisualizeMode(traceData, pyInputCodeMirror.getValue());
+              preprocessBackendResult(traceData, pyInputCodeMirror.getValue());
             }
           },
           "json");
diff --git a/PyTutorGAE/js/edu-python.js b/PyTutorGAE/js/edu-python.js
@@ -108,7 +108,7 @@ function htmlspecialchars(str) {
   return str;
 }
 
-function processTrace(jumpToEnd) {
+function enterVisualizeMode(jumpToEnd) {
   curInstr = 0;
 
   // only do this at most ONCE, and then clear out preseededCurInstr
@@ -121,28 +121,9 @@ function processTrace(jumpToEnd) {
   $("#pyStdout").val('');
 
   if (curTrace.length > 0) {
-    var lastEntry = curTrace[curTrace.length - 1];
-
-    // GLOBAL!
-    instrLimitReached = (lastEntry.event == 'instruction_limit_reached');
-
-    if (instrLimitReached) {
-      curTrace.pop() // kill last entry
-      var warningMsg = lastEntry.exception_msg;
-      $("#errorOutput").html(htmlspecialchars(warningMsg));
-      $("#errorOutput").show();
-    }
-    // as imran suggests, for a (non-error) one-liner, SNIP off the
-    // first instruction so that we start after the FIRST instruction
-    // has been executed ...
-    else if (curTrace.length == 2) {
-      curTrace.shift();
-    }
-
-
     if (jumpToEnd) {
       // if there's an exception, then jump to the FIRST occurrence of
-      // that exception.  otherwise, jump to the very end of execution.
+      // that exception. otherwise, jump to the very end of execution.
       curInstr = curTrace.length - 1;
 
       for (var i = 0; i < curTrace.length; i++) {
@@ -165,8 +146,7 @@ function processTrace(jumpToEnd) {
   $('#executionSlider').slider({
     min: 0,
     max: curTrace.length - 1,
-    step: 1
-
+    step: 1,
   });
 
   //disable keyboard actions on the slider itself (to prevent double-firing of events)
@@ -889,6 +869,15 @@ function renderDataStructures(curEntry, vizDiv) {
   console.log('---');
   */
 
+  // VERY VERY experimental!!!
+  // when doing this for realz, convert to using d3 and use row ID tag
+  // as unique object ID for object constancy.
+  var curEntryLayout = curTraceLayouts[curInstr];
+  toplevelHeapLayout = curEntryLayout.map(function(row)
+    {return row.slice(1, row.length); // KRAZY!!! remove row ID tag for now
+  });
+
+
 
   // Heap object rendering phase:
 
