# HG changeset patch # User tzara # Date 1341788233 -3600 # Node ID e05eede75e0dab10c3efc3da5e7d1d73849e041e # Parent 6e6dd1ed032b06fb7ef1d7250243bfcce8218e60 some cleaning up of html css js diff -r 6e6dd1ed032b -r e05eede75e0d nodescore.js --- a/nodescore.js Sun Jul 08 23:56:26 2012 +0100 +++ b/nodescore.js Sun Jul 08 23:57:13 2012 +0100 @@ -149,7 +149,6 @@ //////////////////////////////////////////// var counter = ztime/1000 - socket.emit('counterText', seq.voice, seq.counter, counter); if (counter > 0 && counter <= outcount ) { @@ -160,7 +159,7 @@ socket.broadcast.emit('countinFromServer', seq.voice, " ", "","", "white","transparent"); } - console.log(counter + "========" + totaltime) + // console.log(counter + "========" + totaltime) if (counter > (totaltime)-incount && counter <= totaltime ) { socket.broadcast.emit('countinFromServer', seq.voice, counter-(totaltime-incount), "","", "red","gray"); } @@ -171,7 +170,7 @@ // push out the pulse to metronome seq.metrobeat = (seq.metrobeat+1)%seq.beatsinbar ; - console.log(seq.metrobeat); + //console.log(seq.metrobeat); socket.broadcast.emit('metroPulse', tempoms, seq.voice,seq.metrobeat); socket.emit('metroPulse', tempoms, seq.voice,seq.metrobeat); } @@ -182,8 +181,10 @@ seq.counter = (seq.counter + 1) % seq.durations.length socket.broadcast.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter); socket.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter); + delete tock; + step(seq); - + } if (ztime < 0){} diff -r 6e6dd1ed032b -r e05eede75e0d www/m/1.html --- a/www/m/1.html Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/1.html Sun Jul 08 23:57:13 2012 +0100 @@ -9,8 +9,7 @@ - - + @@ -46,4 +45,22 @@ + +

wait

+ diff -r 6e6dd1ed032b -r e05eede75e0d www/m/2.html --- a/www/m/2.html Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/2.html Sun Jul 08 23:57:13 2012 +0100 @@ -10,7 +10,7 @@ - + diff -r 6e6dd1ed032b -r e05eede75e0d www/m/3.html --- a/www/m/3.html Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/3.html Sun Jul 08 23:57:13 2012 +0100 @@ -10,7 +10,7 @@ - + diff -r 6e6dd1ed032b -r e05eede75e0d www/m/4.html --- a/www/m/4.html Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/4.html Sun Jul 08 23:57:13 2012 +0100 @@ -10,7 +10,7 @@ - + diff -r 6e6dd1ed032b -r e05eede75e0d www/m/controls.html --- a/www/m/controls.html Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/controls.html Sun Jul 08 23:57:13 2012 +0100 @@ -2,88 +2,80 @@ - - + - - + + +

00:00:00.0

+ + +

+

+

+

+ + + + + +

+

00:00:00.0

Latency:

0ms

+ +

- -

- -

- -

- -

-

- -

- -

-

- - - - - - -

-

- -

Calculate Client Latencies

- -

0ms

- -

diff -r 6e6dd1ed032b -r e05eede75e0d www/m/css/nodescore.css --- a/www/m/css/nodescore.css Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/css/nodescore.css Sun Jul 08 23:57:13 2012 +0100 @@ -45,27 +45,42 @@ top: 10% } +#preview{ + height: 240px; + width: 400px; + border: 1px solid blue; + position: absolute; + padding: 5px 5px 5px 5px ; + color: black; + bottom: 0%; + right: 0px; +} + + .outersquare{ - height: 220px; - width: 300px; + height: 300px; + width: 385px; border: 1px solid blue; position: absolute; top: 100px; left: 400px; - padding: 5px 5px 5px 5px ; + padding: 1px 1px 1px 1px ; background-color: black; } .latencies{ - height: 150px; - width: 300px; + height: 90px; + width: 200px; border: 1px solid blue; position: relative; + float: right; top: 15%; padding: 5px 5px 5px 5px ; - background-color: gray; + background-color: blue; + } + .metrocase { position: absolute; top: 10px; @@ -124,13 +139,15 @@ } .magicsquare { + border: 2px solid white; + padding: 1px 1px 1px 1 px; background: blue; - width: 50px; - height: 50px; + width: 60px; + height: 60px; border-radius: 10px; float: left; color: black; - font-size: 2em; + font-size: 4em; text-align: center; } diff -r 6e6dd1ed032b -r e05eede75e0d www/m/js/nodescore-client.js --- a/www/m/js/nodescore-client.js Sun Jul 08 23:56:26 2012 +0100 +++ b/www/m/js/nodescore-client.js Sun Jul 08 23:57:13 2012 +0100 @@ -26,32 +26,9 @@ }) } - - function metronomeTick(pulse, voice,metrobeat) { - console.log( voice+ " metronome tick" + metrobeat) var color = "gray" - metroCss(0, "red", "4") - -//if (metrobeat == 0) { -// metroCss(0, "gray", "1") - // } - - //if (metrobeat == 3) { -// metroCss(0, "white", "4") - // } - -// if (metrobeat == 1||metrobeat == 2){ -// $("#metronome"+metrobeat).stop(); -// $("#metronome"+metrobeat).css('background-color', color); -// $("#metronome"+metrobeat).text(" "); - //$("#metronome"+metrobeat).text(metrobeat+1); -// $("#metronome"+metrobeat).animate({opacity: 1}, -// 50, - // function() { $(this).animate({opacity:0.0}); } -// ); - // } }; ///////////////////////////////////////////////// @@ -66,11 +43,15 @@ function pageFlip(unit) { console.log("flipping page:"+ unit); $('#sections').trigger('goto', [parseFloat(unit)]); +// $('#sections-preview').trigger('goto', [parseFloat(unit+1)]); //metroStart(1000); //document.getElementById("countdowncase").style.visibility="hidden"; } + + ///////////////////////////////////////////////// + // call the fancy jquery functions function slideTo (target) { $('#sections').trigger('goto', [target]); } @@ -81,15 +62,25 @@ socket.on("pageFlipfromserver", pageTurn); function pageTurn (group,unit,time,mm) { var groupPage=document.getElementById('group').value; - console.log("fromservercommand has been executed on client"); + //console.log("fromservercommand has been executed on client"); if (group == groupPage) { var g= pad2(group); var p= pad2(unit); - pageFlip(unit); - } +// pageFlip(unit); + pageTurnB(p) + + } else { console.log("not for this group... ignoring... for group:" + group ); } } -///////////////////////////////////////////////// \ No newline at end of file +///////////////////////////////////////////////// + +function pageTurnB(unit) { + console.log("HOP TURN" + unit); + $("#live").html($("#unit"+unit).html()); + +} + +//////////////////////////////////////////////// \ No newline at end of file