almost ready

Philip Guo · Philip Guo · commit 768ad7b47af2 · 2011-09-23T11:23:55.000-07:00
diff --git a/edu-python.css b/edu-python.css
@@ -94,8 +94,10 @@ span {
   margin-bottom: 35px;
 }
 
-table#stackHeapTable td {
+td#stack_td,
+td#heap_td {
   vertical-align:top;
+  font-size: 12pt;
 }
 
 table#pyOutputPane {
diff --git a/edu-python.js b/edu-python.js
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // set to true to use jsPlumb library to render connections between
 // stack and heap objects
-var useJsPlumbRendering = false;
+var useJsPlumbRendering = true;
 
 // if true, then render the stack as growing downwards
 // (if useJsPlumbRendering is true)
@@ -157,8 +157,7 @@ function highlightCodeLine(curLine, visitedLinesSet, hasError, isTerminated) {
 
 // relies on curTrace and curInstr globals
 function updateOutput() {
-  // update based on experimental checkbox ...
-  useJsPlumbRendering = $("#useJsPlumbCheckbox").prop("checked");
+  useJsPlumbRendering = !($("#classicModeCheckbox").prop("checked"));
 
   var curEntry = curTrace[curInstr];
   var hasError = false;
@@ -413,7 +412,7 @@ function renderDataStructuresVersion2(curEntry, vizDiv) {
 
   // create a tabular layout for stack and heap side-by-side
   // TODO: figure out how to do this using CSS in a robust way!
-  $(vizDiv).html('<table id="stackHeapTable"><tr><td><div id="stack"></div></td><td><div id="heap"></div></td></tr></table>');
+  $(vizDiv).html('<table id="stackHeapTable"><tr><td id="stack_td"><div id="stack"></div></td><td id="heap_td"><div id="heap"></div></td></tr></table>');
 
 
   var nonEmptyGlobals = false;
@@ -1226,7 +1225,7 @@ $(document).ready(function() {
 
 
   // select an example on start-up:
-  $("#tutorialExampleLink").trigger('click');
+  $("#aliasExampleLink").trigger('click');
 
 
   // disable controls initially ...
diff --git a/example-code/aliasing.txt b/example-code/aliasing.txt
@@ -1,13 +1,16 @@
+# Example of aliasing
 x = [1, 2, 3]
 y = x
 x.append(4)
 y.append(5)
 z = [1, 2, 3, 4, 5]
 x.append(6)
+y.append(7)
 y = "hello"
 
 def foo(lst):
-  lst.append("hi there")
+  lst.append("hello")
+  print lst
 
 foo(x)
 foo(z)
diff --git a/index.html b/index.html
@@ -72,26 +72,24 @@
 
 <button id="executeBtn" class="bigBtn" type="button">Visualize execution</button>
 
-<br/><br/><input type="checkbox" id="useJsPlumbCheckbox"/> Draw connector diagrams (experimental)
-
 </p>
 
 <p style="margin-top: 25px;">Try these small examples:<br/>
 
+<a id="aliasExampleLink" href="#">aliasing</a> |
 <a id="tutorialExampleLink" href="#">intro</a> |
 <a id="factExampleLink" href="#">factorial</a> |
 <a id="fibonacciExampleLink" href="#">fibonacci</a> |
 <a id="memoFibExampleLink" href="#">memoized fib</a> |
 <a id="newtonExampleLink" href="#">square root</a> |
-<a id="insSortExampleLink" href="#">insertion sort</a> |
-<a id="strtokExampleLink" href="#">tokenize</a>
+<a id="insSortExampleLink" href="#">insertion sort</a>
 <br/>
 <a id="filterExampleLink" href="#">filter</a> |
-<a id="aliasExampleLink" href="#">aliasing</a> |
+<a id="strtokExampleLink" href="#">tokenize</a> |
 <a id="oopSmallExampleLink" href="#">OOP</a> |
 <a id="pwGcdLink" href="#">gcd</a> |
 <a id="pwSumListLink" href="#">sumList</a> |
-<a id="towersOfHanoiLink" href="#">hanoi</a> |
+<a id="towersOfHanoiLink" href="#">towers of hanoi</a> |
 <a id="pwTryFinallyLink" href="#">exceptions</a>
 
 </p>
@@ -107,6 +105,10 @@
 
 </p>
 
+<p>
+<br/><input type="checkbox" id="classicModeCheckbox"/> Use low-bandwidth mode (for older browsers)
+</p>
+
 </div>
 
 

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,10 @@ span {`
`94`	`94`	`margin-bottom: 35px;`
`95`	`95`	`}`
`96`	`96`
`97`		`-table#stackHeapTable td {`
	`97`	`+td#stack_td,`
	`98`	`+td#heap_td {`
`98`	`99`	`vertical-align:top;`
	`100`	`+ font-size: 12pt;`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`table#pyOutputPane {`