bah

pgbovine · pgbovine · commit b080841aa043 · 2013-01-06T20:06:37.000-08:00
diff --git a/v3/js/opt-frontend.js b/v3/js/opt-frontend.js
@@ -200,6 +200,7 @@ $(document).ready(function() {
                                                       // tricky: selector 'true' and 'false' values are strings!
                                                       disableHeapNesting: ($('#heapPrimitivesSelector').val() == 'true'),
                                                       drawParentPointers: ($('#drawParentPointerSelector').val() == 'true'),
+                                                      textualMemoryLabels: ($('#textualMemoryLabelsSelector').val() == 'true'),
                                                       //allowEditAnnotations: true,
                                                      });
 
@@ -484,6 +485,10 @@ $(document).ready(function() {
   if (drawParentPointerState !== undefined) {
     $('#drawParentPointerSelector').val(drawParentPointerState);
   }
+  var textRefsState = $.bbq.getState('textReferences');
+  if (textRefsState !== undefined) {
+    $('#textualMemoryLabelsSelector').val(textRefsState);
+  }
   var pyState = $.bbq.getState('py');
   if (pyState !== undefined) {
     $('#pythonVersionSelector').val(pyState);
@@ -529,6 +534,7 @@ $(document).ready(function() {
                   cumulative: $('#cumulativeModeSelector').val(),
                   heapPrimitives: $('#heapPrimitivesSelector').val(),
                   drawParentPointers: $('#drawParentPointerSelector').val(),
+                  textReferences: $('#textualMemoryLabelsSelector').val(),
                   py: $('#pythonVersionSelector').val()};
 
     if (appMode == 'display') {
@@ -546,6 +552,7 @@ $(document).ready(function() {
                   cumulative: $('#cumulativeModeSelector').val(),
                   heapPrimitives: $('#heapPrimitivesSelector').val(),
                   drawParentPointers: $('#drawParentPointerSelector').val(),
+                  textReferences: $('#textualMemoryLabelsSelector').val(),
                   py: $('#pythonVersionSelector').val(),
                   curInstr: myVisualizer.curInstr,
                  };
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -86,6 +86,9 @@ var curVisualizerID = 1; // global to uniquely identify each ExecutionVisualizer
 //                          codeDivWidth=350, codeDivHeight=400
 //   drawParentPointers   - if true, then draw environment diagram parent pointers for all frames
 //                          WARNING: there are hard-to-debug MEMORY LEAKS associated with activating this option
+//   textualMemoryLabels  - render references using textual memory labels rather than as jsPlumb arrows.
+//                          this is good for slow browsers or when used with disableHeapNesting
+//                          to prevent "arrow overload"
 //   updateOutputCallback - function to call (with 'this' as parameter)
 //                          whenever this.updateOutput() is called
 //                          (BEFORE rendering the output display)
@@ -121,8 +124,10 @@ function ExecutionVisualizer(domRootID, dat, params) {
   this.arrowOffsetY = undefined;
   this.codeRowHeight = undefined;
 
-  this.disableHeapNesting = (this.params.disableHeapNesting == true); // avoid 'undefined' state
-  this.drawParentPointers = (this.params.drawParentPointers == true); // avoid 'undefined' state
+  // avoid 'undefined' state
+  this.disableHeapNesting = (this.params.disableHeapNesting == true);
+  this.drawParentPointers = (this.params.drawParentPointers == true);
+  this.textualMemoryLabels = (this.params.textualMemoryLabels == true);
 
   // cool, we can create a separate jsPlumb instance for each visualization:
   this.jsPlumbInstance = jsPlumb.getInstance({
diff --git a/v3/visualize.html b/v3/visualize.html
@@ -83,10 +83,14 @@
   <select id="heapPrimitivesSelector">
     <option value="false">inline primitives and nested objects</option>
     <option value="true">render all objects on the heap</option>
-  </select>, and
+  </select>,
   <select id="drawParentPointerSelector">
     <option value="false">hide environment parent pointers</option>
     <option value="true">show environment parent pointers</option>
+  </select>, and
+  <select id="textualMemoryLabelsSelector">
+    <option value="false">draw references using arrows</option>
+    <option value="true">use text labels for references</option>
   </select>.
 </p>
 
