Skip to content

Commit

Permalink
Thurday
Browse files Browse the repository at this point in the history
  • Loading branch information
stephensm authored and stephensm committed Aug 8, 2013
2 parents 03625d1 + f910eee commit 1c21a71
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 28 deletions.
2 changes: 1 addition & 1 deletion heat-diffusion.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function HeatSolver(startingTemps,timestep,spacestep){
var count=0;
var maxTemps=[];
var firstMaxTemp=[];
for(var i=0;i<tempArray[0].length;i++)
for(var i=tempArray[0].length-1;i>-1;i--)
{
firstMaxTemp.push(tempArray[0][i])
}
Expand Down
32 changes: 6 additions & 26 deletions perfectSteak.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,28 +219,7 @@ var clicked=false;
var displayDiv = $("<div class='displayDiv'></div>");

displayDiv.append(inputTable);

// displayDiv.change(function(){
// model.checkDiv()
// model.buildData();
// updateTime();
// for (var j=0; j<model.currentInfo["numRows"]; j++){
// var timeInSecs=$("#row"+j+"time").val().replace(':','.').split('.');
// if(timeInSecs.length>1)
// {var time=60*parseFloat(timeInSecs[0])+parseFloat(timeInSecs[1]);}
// else{var time=parseFloat(timeInSecs[0]);}
// $("#row"+j+"time").val(model.convertTime(time))
//}
// }


// model.buildData();
// updateTime();

// if(clicked&&model.currentInfo["OKToGraph"]){graph(false)}

// else{ d3.selectAll(".containters").remove();
// d3.selectAll(".mysteak").remove();

var onoff=function(){
currentvalue = $(document.getElementById('onoff')).html();
if(currentvalue == "Protein State"){
Expand All @@ -251,6 +230,7 @@ var onoff=function(){
graph(false,'False');
}
}

var addButton;
var flipButton;
var cookButton;
Expand All @@ -264,20 +244,20 @@ var onoff=function(){
var saveModal=$('<div id="saveBut" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"><div class="modal-body">Please select a name for your recipe <p> <input type="text" id="recipeName"></input><p><button class="btn" data-dismiss="modal" aria-hidden="true">OK</button></div></div>');
var cookDropdown=$("<div class='dropdown'><select class='cookDropdown'></select></div>");


var quickAddModal=$('<div id="quickAdd" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h3 id="myModalLabel">Quick Add</h3></div><div class="modal-body"> <p class="cookp">Cook at: </p></div><div class="modal-footer"><button class="btn" data-dismiss="modal" aria-hidden="true">OK</button></div></div>');
$(".cookp").append(cookDropdown);
displayDiv.append(saveModal, quickAddModal)

saveBut.on("click", function(){

///var selectName=$("<div class='selectName'></div>")
//var name=$("#recipeName").val();

//model.saveRecipe(name);


});




var updateTime=function(){
var time=0;
for(var i=0;i<model.currentInfo["numRows"];i++){
Expand Down
1 change: 0 additions & 1 deletion sample.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ var calculate=function(data,steak,meatType,first,totalTime){
var flame=Thedata.points;
var timestep=1/Thedata.step;
var maxTemps=Thedata.maxTemps;

if(first){
drawFinished(meatType,maxTemps,data,steak[0],0);
drawFinished(meatType,maxTemps,data,steak[0],1);
Expand Down

0 comments on commit 1c21a71

Please sign in to comment.