added showAllFrameLabels option

pgbovine · pgbovine · commit fe69c9e702c7 · 2014-06-05T17:19:01.000-04:00
diff --git a/v3/js/composingprograms.js b/v3/js/composingprograms.js
@@ -116,6 +116,7 @@ function executeCode(forceStartingInstr, forceRawInputLst) {
                               executeCodeWithRawInputFunc: executeCodeWithRawInput,
                               updateOutputCallback: function() {$('#urlOutput,#embedCodeOutput').val('');},
                               compactFuncLabels: true,
+                              showAllFrameLabels: true,
                              }
 
     executePythonCode(pyInputCodeMirror.getValue(),
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -110,6 +110,7 @@ var curVisualizerID = 1; // global to uniquely identify each ExecutionVisualizer
 //   highlightLines - highlight current and previously executed lines (default: false)
 //   arrowLines     - draw arrows pointing to current and previously executed lines (default: true)
 //   compactFuncLabels - render functions with a 'func' prefix and no type label
+//   showAllFrameLabels - display frame and parent frame labels for all functions (default: false)
 //   pyCrazyMode    - run with Py2crazy, which provides expression-level
 //                    granularity instead of line-level granularity (HIGHLY EXPERIMENTAL!)
 //   hideCode - hide the code display and show only the data structure viz
@@ -192,8 +193,7 @@ function ExecutionVisualizer(domRootID, dat, params) {
   this.textualMemoryLabels = (this.params.textualMemoryLabels == true);
   this.showOnlyOutputs = (this.params.showOnlyOutputs == true);
   this.tabularView = (this.params.tabularView == true);
-
-  //this.tabularView = true; // for testing only
+  this.showAllFrameLabels = (this.params.showAllFrameLabels == true);
 
   this.executeCodeWithRawInputFunc = this.params.executeCodeWithRawInputFunc;
 
@@ -2533,8 +2533,8 @@ ExecutionVisualizer.prototype.renderDataStructures = function(curEntry, curTople
 
       var headerLabel = funcName;
 
-      // only display if you're someone's parent
-      if (frame.is_parent) {
+      // only display if you're someone's parent (unless showAllFrameLabels)
+      if (frame.is_parent || myViz.showAllFrameLabels) {
         headerLabel = 'f' + frame.frame_id + ': ' + headerLabel;
       }
 
@@ -2543,6 +2543,9 @@ ExecutionVisualizer.prototype.renderDataStructures = function(curEntry, curTople
         var parentFrameID = frame.parent_frame_id_list[0];
         headerLabel = headerLabel + ' [parent=f' + parentFrameID + ']';
       }
+      else if (myViz.showAllFrameLabels) {
+        headerLabel = headerLabel + ' [parent=Global]';
+      }
 
       return headerLabel;
     });
@@ -3388,6 +3391,9 @@ function(objID, stepNum, d3DomElement, isTopLevel) {
     if (parentFrameID) {
       d3DomElement.append('<div class="funcObj">' + funcPrefix + ' ' + funcName + ' [parent=f'+ parentFrameID + ']</div>');
     }
+    else if (myViz.showAllFrameLabels) {
+      d3DomElement.append('<div class="funcObj">' + funcPrefix + ' ' + funcName + ' [parent=Global]</div>');
+    }
     else {
       d3DomElement.append('<div class="funcObj">' + funcPrefix + ' ' + funcName + '</div>');
     }

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ function executeCode(forceStartingInstr, forceRawInputLst) {`
`116`	`116`	`executeCodeWithRawInputFunc: executeCodeWithRawInput,`
`117`	`117`	`updateOutputCallback: function() {$('#urlOutput,#embedCodeOutput').val('');},`
`118`	`118`	`compactFuncLabels: true,`
	`119`	`+ showAllFrameLabels: true,`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`executePythonCode(pyInputCodeMirror.getValue(),`