From d284c35f776869d7b2b6a31a410ffd91aa342da4 Mon Sep 17 00:00:00 2001
From: stephensm <marissastephens@Marissas-MacBook-Pro.local>
Date: Mon, 12 Aug 2013 14:24:06 -0400
Subject: [PATCH] Marissas Updated now with prerecorded data and tooltio

---
 .DS_Store       | Bin 12292 -> 12292 bytes
 graph.js        |   8 ++++----
 perfectSteak.js |  22 +++++++++++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 034166d50210fab1f57bf3d830d6017450cabcce..5b3a61b8b6c2eb5dd368e3f23b6793a39bf1442d 100644
GIT binary patch
delta 139
zcmZokXi1ph&nUeyU^hRb^kyD`0;bIygiM$xtBDmz@-q}OBr=pSq%x#11OdrphD?S6
vAYD9}QABj|0wGqG|3EOgU#xj!nJ(jIc8PB+lMO{Tlc;xdn|z(X#D+BhK4>fU

delta 300
zcmZokXi1ph&nUMsU^hRb+-4qu0w#VghGd3(Ak1dSWXNMkpIk2{%6Wr<fk6X^&u%Ui
zvSwx!oLnd>&7Q$f!jQ|5Gg(kXc=8g_n#pluHG!NAVL)xg45bW-3^@#X3|S1to;mr+
zNjdpRK<xrR?8d;rbmBi40C@}y{0wDCI!YK)fx1h8I$@?WiU~8Gn0#Jr!e(}fZ!D8f
Piae*k^_$Pj^$Gw0KL}6a

diff --git a/graph.js b/graph.js
index f3c0c5a..f20c677 100644
--- a/graph.js
+++ b/graph.js
@@ -187,15 +187,15 @@ var rect = layer.selectAll("rect")
 
 
 	var Offset = document.getElementById("graphSteak").offsetTop;
-	var pos=parseInt(data[0].length-(event.pageY-Offset-margin.top-300)/(height/yStackMax));
+	var pos=parseInt(data[0].length-(event.pageY-Offset-margin.top-320)/(height/yStackMax));
 var line=parseInt((event.pageX-parseFloat($("body").css('margin-left'))-margin.left)/(x.rangeBand()+1.2)-1.5);
 console.log(line);
 	$("line").remove();
 	var myLine = d3.selectAll(".mysteak").append("svg:line")
     .attr("x1", margin.left)
-    .attr("y1", event.pageY-Offset-295)
+    .attr("y1", event.pageY-Offset-322)
     .attr("x2", width*32/30)
-    .attr("y2", event.pageY-Offset-295)
+    .attr("y2", event.pageY-Offset-322)
 	.style("z-index",-1)
     .style("stroke", "grey");
 	//console.log(d3.event.pageX-parseFloat($("body").css('margin-left')));
@@ -205,7 +205,7 @@ console.log(line);
 	ttip.html(toF(parseFloat(data[line][pos])).toFixed(2)+ "\xB0F")  }
 	else{
 		ttip.html(parseFloat(data[line][pos]).toFixed(2)+ "\xB0C")}
-	 //  ttip.html(line.toFixed(2)+ "\xB0C") 
+	 //  ttip.html(pos.toFixed(2)+ "\xB0C") 
 	
 	   			ttip.style("opacity", 1)
                 .style("left", (d3.event.pageX-parseFloat($("body").css('margin-left'))+10) + "px")     
diff --git a/perfectSteak.js b/perfectSteak.js
index a96b616..76893c6 100644
--- a/perfectSteak.js
+++ b/perfectSteak.js
@@ -19,13 +19,25 @@ var perfectSteak = function (div) {
 
         var timeStep = 15;
         var inputTable = $(".inputTable");
+		 var toC = function (F) {
+            return ((5 / 9) * (F - 32));
+        }
 var importRecipes=function(){
-		var saved=[{"name":"15 seconds flip for 10 minutes","data":[[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300]],"Temp":73},
-				   {"name":"5 minutes a side","data":[[300,300,73],[300,73,300],[300,73,73]],"Temp":73},
-					   {"name":"sous-vide","data":[[3600,140,140],[60,300,73],[60,73,300]],"Temp":73}];
+		var saved=[{"name":"Heston Blumenthal","data":[[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[15,73,300],[15,300,73],[300,73,73]],"Temp":73},
+	{"name":"4 minutes a side","data":[[240,300,73],[240,73,300],[300,73,73]],"Temp":73},
+	{"name":"America's Test Kitchen","data":[[15,450,73],[15,73,450],[300,225,225],[900,73,73]],"Temp":73},
+					   {"name":"Nathan Mhyrvold","data":[[3600,125,125],[30,-321,-321],[60,390,390]],"Temp":73}];
 		for (var i=0;i<3;i++){
 				var name=saved[i]["name"];
 				var data=saved[i]["data"];
+				
+		
+	for(var n=0;n<data.length;n++)
+	{
+		data[n][1]=toC(data[n][1]);
+		data[n][2]=toC(data[n][2]);
+	}
+	
 			var steaktemp=saved[i]["Temp"];
 			var steak = [data[0][1]];
             for (var m = 0; m < 30; m++) {
@@ -36,7 +48,7 @@ var importRecipes=function(){
             var Thedata = myheatsolver.sixty_graph_arrays_duration(data);
             var maxTemps = Thedata.maxTemps;
             var meatType = "Steak";
-            var recipe = [meatType, maxTemps, data, steaktemp,30,'F'];
+            var recipe = [meatType, maxTemps, data, steaktemp,3,'F'];
             addRecipe(name, recipe);
 			}
 		}
@@ -366,7 +378,7 @@ var importRecipes=function(){
 				console.log(info);
                 d3.selectAll('.finalsteak').remove();
 			
-                drawFinished(info[0], info[1], info[2], info[3], 0,info[4],info[4]);
+                drawFinished(info[0], info[1], info[2], info[3], 0,info[4],info[5]);
                 var inf = model.currentInfo['recipe'][name2];
                 drawFinished(inf[0], inf[1], inf[2], inf[3], 1,inf[4],inf[5]);
             });