# HG changeset patch # User tzara # Date 1341645056 0 # Node ID 0a81334900503ea2b1cb190150c63275b77a3b40 # Parent 0e5543ccb8fbe871635dcf4f0298a62e25831697 absorbed metronome.js .css into main css and client files also some minor html5 and css changes diff -r 0e5543ccb8fb -r 0a8133490050 INSTALL --- a/INSTALL Fri Jul 06 10:48:15 2012 +0100 +++ b/INSTALL Sat Jul 07 07:10:56 2012 +0000 @@ -20,7 +20,7 @@ mkdir -p /tmp/build/node && cd /tmp/build/node git clone https://github.com/joyent/node.git . -git checkout v0.6.7 +git checkout v0.8.0 ./configure --openssl-libpath=/usr/lib/ssl make diff -r 0e5543ccb8fb -r 0a8133490050 nodescore.js --- a/nodescore.js Fri Jul 06 10:48:15 2012 +0100 +++ b/nodescore.js Sat Jul 07 07:10:56 2012 +0000 @@ -20,7 +20,7 @@ clientFiles.serve(request, response); }); }); -httpServer.listen(8888); +httpServer.listen(8889); //////////////////////////////////////////// // connect to websockets diff -r 0e5543ccb8fb -r 0a8133490050 www/m/1.html --- a/www/m/1.html Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/1.html Sat Jul 07 07:10:56 2012 +0000 @@ -4,17 +4,13 @@ - - - - diff -r 0e5543ccb8fb -r 0a8133490050 www/m/2.html --- a/www/m/2.html Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/2.html Sat Jul 07 07:10:56 2012 +0000 @@ -4,20 +4,13 @@ - - - - - + - - + - - @@ -30,16 +23,15 @@
- - -
00:00:00.0
- -
+ +
00:00:00.0
+
+
    -

  • wait

    • +

  • wait

    • diff -r 0e5543ccb8fb -r 0a8133490050 www/m/3.html --- a/www/m/3.html Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/3.html Sat Jul 07 07:10:56 2012 +0000 @@ -4,20 +4,13 @@ - - - - - + - - + - - @@ -30,16 +23,15 @@
    -
- -
00:00:00.0
- -
+
+
00:00:00.0
+
+
    -

  • wait

    • +

  • wait

    • diff -r 0e5543ccb8fb -r 0a8133490050 www/m/4.html --- a/www/m/4.html Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/4.html Sat Jul 07 07:10:56 2012 +0000 @@ -4,20 +4,13 @@ - - - - - + - - + - - @@ -30,16 +23,15 @@
    -
- -
00:00:00.0
- -
+
+
00:00:00.0
+
+
    -

  • wait

    • +

  • wait

    • diff -r 0e5543ccb8fb -r 0a8133490050 www/m/controls.html --- a/www/m/controls.html Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/controls.html Sat Jul 07 07:10:56 2012 +0000 @@ -5,15 +5,14 @@ - - + -

    Multicast Network Score Controls

    +
    00:00:00.0
    @@ -23,13 +22,9 @@
    -
    -

    Calculate Client Latencies


    - -

    0ms

    -
    - -

    Magic Sequencer Monitor


    + +
    +

    @@ -70,7 +65,7 @@

    - +



    @@ -79,17 +74,21 @@

    +
    + +
    +

    Calculate Client Latencies


    + +

    0ms

    +
    +
    +
    + -client_1 -client_2 -client_3 -client_4 - - diff -r 0e5543ccb8fb -r 0a8133490050 www/m/css/metronome.css --- a/www/m/css/metronome.css Fri Jul 06 10:48:15 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -.metrocase { - position: absolute; - top: 10px; - left: 10px; - color: black; - text-align: center; - font-size: 4em; - font-color: black; - background: transparent; - width: 240px; - height: 60px; - z-index: 2; - padding: 5px 5px 5px 5px; - border: 1px solid gray; -} - -#metronome0 { width: 60px; height: 60px; border-radius: 30px; float:left; } -#metronome1 { width: 60px; height: 60px; border-radius: 30px; float:left; } -#metronome2 { width: 60px; height: 60px; border-radius: 30px; float:left; } -#metronome3 { width: 60px; height: 60px; border-radius: 30px; float:left; } \ No newline at end of file diff -r 0e5543ccb8fb -r 0a8133490050 www/m/css/nodescore.css --- a/www/m/css/nodescore.css Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/css/nodescore.css Sat Jul 07 07:10:56 2012 +0000 @@ -9,7 +9,6 @@ background-color: white; display: inline; color: #666; - // padding: 0px 10px 0px 10px ; z-index: 2; } @@ -30,6 +29,12 @@ list-style:none; } + +.page{ + height: 1000px;; + width: 1280px; +} + .outermaster{ height: 800px; width: 1280px; @@ -37,8 +42,50 @@ position: relative; padding: 5px 5px 5px 5px ; color: black; + top: 10% } +.outersquare{ + height: 220px; + width: 300px; + border: 1px solid blue; + position: absolute; + top: 100px; + left: 400px; + padding: 5px 5px 5px 5px ; + background-color: black; +} + +.latencies{ + height: 150px; + width: 300px; + border: 1px solid blue; + position: relative; + top: 15%; + padding: 5px 5px 5px 5px ; + background-color: gray; +} + +.metrocase { + position: absolute; + top: 10px; + left: 10px; + color: black; + text-align: center; + font-size: 4em; + font-color: black; + background: transparent; + width: 240px; + height: 60px; + z-index: 2; + padding: 5px 5px 5px 5px; + border: 1px solid gray; +} + +#metronome0 { width: 60px; height: 60px; border-radius: 30px; float:left; } +#metronome1 { width: 60px; height: 60px; border-radius: 30px; float:left; } +#metronome2 { width: 60px; height: 60px; border-radius: 30px; float:left; } +#metronome3 { width: 60px; height: 60px; border-radius: 30px; float:left; } #fluid {} .fluid-img{height:50%; width:50%;} diff -r 0e5543ccb8fb -r 0a8133490050 www/m/js/client.js --- a/www/m/js/client.js Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/js/client.js Sat Jul 07 07:10:56 2012 +0000 @@ -3,6 +3,57 @@ var socket = io.connect(); +//socket.on("metroPulse", metronomeTick); +///////////////////////////////////////////////// +socket.on("metroPulse", pulseInClient); +function pulseInClient(pulse,groupID,metrobeat){ + var groupPage=document.getElementById('group').value + if (groupID == groupPage) { + metronomeTick(1000, groupID, metrobeat); + } +} +///////////////////////////////////////////////// +function metroCss(beat, beatcolor,text){ + var color = beatcolor; + + $(".metrocase > div").each(function(){$(this).stop()}); + $(".metrocase > div").each(function(){$(this).css('background-color', beatcolor)}); + $(".metrocase > div").each(function(){$(this).text(" ")}); + $(".metrocase > div").each(function(){$(this).animate({opacity: 0.5}, + 50, + function() { $(this).animate({opacity:0.0}); } + ); + }) + } + + + +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}); } +// ); + // } +}; + ///////////////////////////////////////////////// // update the stopwatch value on the client page in line with server diff -r 0e5543ccb8fb -r 0a8133490050 www/m/js/metronome.js --- a/www/m/js/metronome.js Fri Jul 06 10:48:15 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -var socket = io.connect(); - -//socket.on("metroPulse", metronomeTick); -///////////////////////////////////////////////// -socket.on("metroPulse", pulseInClient); -function pulseInClient(pulse,groupID,metrobeat){ - var groupPage=document.getElementById('group').value - if (groupID == groupPage) { - metronomeTick(1000, groupID, metrobeat); - } -} -///////////////////////////////////////////////// -function metroCss(beat, beatcolor,text){ - var color = beatcolor; - - $(".metrocase > div").each(function(){$(this).stop()}); - $(".metrocase > div").each(function(){$(this).css('background-color', beatcolor)}); - $(".metrocase > div").each(function(){$(this).text(" ")}); - $(".metrocase > div").each(function(){$(this).animate({opacity: 0.5}, - 50, - function() { $(this).animate({opacity:0.0}); } - ); - }) - } - - - -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}); } -// ); - // } -}; \ No newline at end of file