comparison www/m/js/controlseq.js @ 60:e868cdd4b3e9

.

-
 //////////////////////////////////////////////
 var socket = io.connect();
 //////////////////////////////////////////////
 // Sequencer Controls
 function startSeq() { socket.emit("startSeq") }
 function stopSeq() { socket.emit("stopSeq") }
 function resetSeq() { socket.emit("resetSeq") }
 //////////////////////////////////////////////
 // Chron Controls
-
 function stopWatch(value) { socket.emit("stopWatch", value) }
-
 //////////////////////////////////////////////
 // Metronome Controls
-
 //socket.on("metroPulse", metronomeTick);
 function metroStart(pulse) {  socket.emit("metroStart", pulse);}
 function metroStop() {  socket.emit("metroStop");}
-
 //////////////////////////////////////////////
 // Latency "Pong"
-
 socket.on("timeFromServer", function(n) { 
     socket.emit("clientTimeResponse",n);
     //console.log(n);
 });
 socket.on("latencyFromServer", function(latency) {
     $("#client_latency").text(latency+"ms.")
 });
-
 function getLatencies(x) { socket.emit("getLatencies", x); }
-
 //////////////////////////////////////////////
 // Chronometer Controls
-
 function startChr() { socket.emit("startChr"); }
 function stopChr() { socket.emit("stopChr"); }
-function resetChr() { 
-    socket.emit("resetChr"); 
-    $("div#client_chronometer").text("00:00:00.0");
-}
-socket.on("chronFromServer", function(chron){
-    //console.log(chron);
-    $("div#client_chronometer").text(chron);
-});
+function resetChr() { socket.emit("resetChr"); 
+		      $("div#client_chronometer").text("00:00:00.0"); }
+socket.on("chronFromServer", function(chron){ 
+    $("div#c_chronometer").text(chron); });
 
 //////////////////////////////////////////////
 // SEQUENCER MONITOR
-
 socket.on("pageFlipfromserver", sequenceMonitor);
 function sequenceMonitor(group, unit,time,mm,seq,unitlast){
-//    var n=6; var x=seq-1; var off=((x%n)+n)%n // thanks claudiusmaximus
-    
+    //    var n=6; var x=seq-1; var off=((x%n)+n)%n // thanks claudiusmaximus
     if (group == 1) { turnmeoff = "#sqr"+unitlast+".sqa"}
     if (group == 2) { turnmeoff = "#sqr"+unitlast+".sqb"}
     if (group == 3) { turnmeoff = "#sqr"+unitlast+".sqc"}
     if (group == 4) { turnmeoff = "#sqr"+unitlast+".sqd"}
-
-    $(turnmeoff).css({'color':'black'})
-
+    $(turnmeoff).css({'color':'black'}) 
 }
 
-socket.on("counterText", function(group,unit,counter,seq){
-    
-    if (group == 1) { $('#sqr'+unit+".sqa").text(counter); 
-		      if (counter == 0 ) { $('#sqr'+unit+".sqa").css("color","black")  }
-		      else { $('#sqr'+unit+".sqa").css("color","yellow")  }
+// countdown to change
+socket.on("countinFromServer", countinCtrl);
+function countinCtrl(groupID, currentseconds,mm,text,colour,background,unit){
+    console.log("#count"+groupID)
+	// all counts to control page
+	$("#counttitle"+groupID).css('color','white');
+	$("#counttitle"+groupID).text(text);
+	$("#count"+groupID).text(currentseconds).css('color','white');
+	document.getElementById("count"+groupID).style.color=colour;
+}
+
+socket.on("counterText", function(group,unit,counter,seq){  
+    if (group == 1) { $('#inner-'+unit+"-0").text(counter); 
+//		      $("#count1").text(currentseconds);
+		      if (counter == 0 ) { $('#inner-'+unit+"-0").css("color","black")  }
+		      else { $('#inner-'+unit+"-0").css("color","yellow")  }
 		    }
     
-    if (group == 2) { $('#sqr'+unit+".sqb").text(counter); 
-		      if (counter == 0 ) { $('#sqr'+unit+".sqb").css("color","black")  }
-		      else { $('#sqr'+unit+".sqb").css("color","green")  }
+    if (group == 2) { $('#inner-'+unit+"-1").text(counter);
+
+		      if (counter == 0 ) { $('#inner-'+unit+"-1").css("color","black")  }
+		      else { $('#inner-'+unit+"-1").css("color","green")  }
 		    } 
  
-    if (group == 3) { $('#sqr'+unit+".sqc").text(counter); 
-		      if (counter == 0 ) { $('#sqr'+unit+".sqc").css("color","black") } 
-		      else { $('#sqr'+unit+".sqc").css("color","aqua")  }
+    if (group == 3) { $('#inner-'+unit+"-2").text(counter);
+
+		      if (counter == 0 ) { $('#inner-'+unit+"-2").css("color","black") } 
+		      else { $('#inner-'+unit+"-2").css("color","aqua")  }
 		    }
     
-    if (group == 4) { $('#sqr'+unit+".sqd").text(counter); 
-		      if (counter == 0 ) { $('#sqr'+unit+".sqd").css("color","black")} 
-		      else { $('#sqr'+unit+".sqd").css("color","red")  }
+    if (group == 4) { $('#inner-'+unit+"-3").text(counter); 
+		      if (counter == 0 ) { $('#inner-'+unit+"-3").css("color","black")} 
+		      else { $('#inner-'+unit+"-3").css("color","red")  }
 		    } 
 }
 	 );
 
 
+/*
 //////////////////////////////////////////////
 // CLient Popup window code
 
 function newPopup(url) {
     popupWindow = window.open(
 	url,'popUpWindow','height=400,width=800,left=10,top=10,resizable=no,scrollbars=no,toolbar=no,menubar=no,location=no,titlebar=no,directories=no,status=yes')}
+
+*/