# HG changeset patch # User tzara # Date 1342453915 -3600 # Node ID ac9641ecf84f7d0d515b9852dd0f74da9d2e3cdb # Parent 8ac67b784a8c24ae8d0fe652c69dfe82f546da2c updated rasterize and ss2thumb to cycle offsets of grab for different anchors removed some bad path stuctures diff -r 8ac67b784a8c -r ac9641ecf84f nodescore --- a/nodescore Sun Jul 15 01:14:27 2012 +0100 +++ b/nodescore Mon Jul 16 16:51:55 2012 +0100 @@ -9,13 +9,13 @@ # nodescore@kiben.net # nodescore.kiben.net -SERVER='http://192.168.1.111:8889' +SERVER='http://192.168.1.94:8889' BASEDIR='www/m' PROJECT='seta' -THUMBPATH=$BASEDIR/$PROJECT/img/thumbs +THUMBPATH=$BASEDIR/thumbs -if [ ! -f $BASEDIR/$PROJECT/music.html ]; - then echo create $BASEDIR/$PROJECT/music.html and add some music +if [ ! -f $BASEDIR/music.html ]; + then echo create $BASEDIR/music.html and add some music exit 0; fi diff -r 8ac67b784a8c -r ac9641ecf84f rasterize.js --- a/rasterize.js Sun Jul 15 01:14:27 2012 +0100 +++ b/rasterize.js Mon Jul 16 16:51:55 2012 +0100 @@ -2,7 +2,9 @@ system = require('system'), address, output, size; -page.clipRect = { top: 70, left: 0, width: 1280, height: 800 } +top = system.args[3]; + +page.clipRect = { top: top, left: 0, width: 1280, height: 800 } if (system.args.length < 3 || system.args.length > 5) { console.log('Usage: rasterize.js URL filename [paperwidth*paperheight|paperformat] [zoom]'); @@ -11,14 +13,16 @@ } else { address = system.args[1]; output = system.args[2]; + + page.viewportSize = { width: 800, height: 800 }; - if (system.args.length > 3 && system.args[2].substr(-4) === ".pdf") { - size = system.args[3].split('*'); + if (system.args.length > 4 && system.args[2].substr(-4) === ".pdf") { + size = system.args[4].split('*'); page.paperSize = size.length === 2 ? { width: size[0], height: size[1], margin: '0px' } : { format: system.args[3], orientation: 'portrait', margin: '1cm' }; } - if (system.args.length > 4) { - page.zoomFactor = system.args[4]; + if (system.args.length > 5) { + page.zoomFactor = system.args[5]; } page.open(address, function (status) { if (status !== 'success') { diff -r 8ac67b784a8c -r ac9641ecf84f ss2thumb.sh --- a/ss2thumb.sh Sun Jul 15 01:14:27 2012 +0100 +++ b/ss2thumb.sh Mon Jul 16 16:51:55 2012 +0100 @@ -12,22 +12,24 @@ SERVER=$2 BASEDIR='m' PROJECT=$1 -THUMBPATH=www/$BASEDIR/$PROJECT/img/thumbs +THUMBPATH="www/$BASEDIR/thumbs" if [ ! -d $THUMBPATH ]; echo creating $THUMBPATH then mkdir -p $THUMBPATH; fi -ANCHORS=`grep ' tmp.svg; cat $i >> tmp.svg ; mv tmp.svg $i; -done; \ No newline at end of file +done; diff -r 8ac67b784a8c -r ac9641ecf84f www/m/css/nodescore.css --- a/www/m/css/nodescore.css Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/css/nodescore.css Mon Jul 16 16:51:55 2012 +0100 @@ -1,5 +1,5 @@ body{ - background-color: gray; + background-color: black; color: white; font: 12px Helvetica, Arial; } @@ -67,26 +67,30 @@ background-color: black; } +.svgmusic { + +width: 1280px; +height: 800px; + +} + .magicsquare { border: 1px solid yellow; padding: 2px 2px 2px 2px; background: blue; - width: 100px; - height: 90px; + width: 100px; height: 90px; border-radius: 20px; float: left; color: black; font-size: 7em; text-align: center; -}​ +} .latencies{ - height: 90px; - width: 200px; + height: 90px; width: 200px; border: 1px solid blue; - position: relative; + position: relative; top: 15%; float: right; - top: 15%; padding: 5px 5px 5px 5px ; background-color: blue; } @@ -95,64 +99,48 @@ display:table-cell; vertical-align:bottom; opacity: 0.7; - height: 25px; text-align: center; - width: 858px; - font-size:1.5em; - color: yellow; + height: 25px; width: 858px; + font-size:1.5em; color: yellow; ! border: 1px solid blue; - position: absolute; + position: absolute; top: 25px; left: 206px; float: left; - left: 206px; - top: 25px; background-color: transparent; } #current{ - opacity: 0.8; - height: 25px; + position: absolute; left: 210px; top: 25px; + height: 25px; width: 130px; text-align: center; - width: 130px; - font-size:1.5em; - font-weight: bold; + font-size:1.5em; font-weight: bold; color: white; ! border: 1px solid blue; - position: absolute; float: left; - left: 210px; - top: 25px; background-color: transparent; z-index: 1; + opacity: 0.8; } #client_latency{ - opacity: 0.8; - height: 25px; - width: 160px; + position: absolute; right: 205px; top: 25px; + height: 25px; width: 160px; font-size:1.5em; color: pink; ! border: 1px solid blue; - position: absolute; - float: left; - right: 205px; - top: 25px; + float: left; background-color: black; z-index: 1; padding: 0px 15px; + opacity: 0.8; } - .metrocase { - position: absolute; - top: 0px; - left: 0px; + position: absolute; top: 0px; left: 0px; + width: 200px; height: 50px; color: black; text-align: center; - font-size: 4em; - font-color: black; + font-size: 4em; font-color: black; background: transparent; - width: 200px; - height: 50px; z-index: 2; border: 1px solid blue; } @@ -163,52 +151,39 @@ #metronome3 { width: 50px; height: 40px; border-radius: 30px; float:left; } #fluid {} -.fluid-img{height:50%; width:50%;} +.fluid-img{ height:50%; width:50%; } -.clear -{ -clear:both; -} +.clear { clear:both; } #client_chronometer{ border: 1px solid blue ; background-color: black; color: white; - font-size: 3em; - text-align: center; + font-size: 3em; text-align: center; opacity:0.7; - position: absolute; - right: 0px; - top: 0px; -// padding: 2px 2px 2px 2px; - width: 220px; - height: 50px; + position: absolute; right: 0px; top: 0px; + width: 220px; height: 50px; z-position: 2; } #countinnumber{ - background-color: gray; - font-size: 48em; + position: absolute; + width: 1280px; height: 800px; + background-color:gray; + font-size: 48em; font-weight:bolder; display:inline; text-align:center; z-index: 2; - position: absolute; opacity:0.5; - font-weight:bolder; - width: 1280px; - height: 800px; } #content-txt { -// padding: 2px 2px 2px 2px; - font-size: 3em; - text-align:center; - background-color: black; - border: 1px solid white; - height: 800px; - width: 1280px; - margin-left:auto; - margin-right:auto; - display: table-cell; - vertical-align: middle; -} + width:1280px; height:800px; + font-size:3em; + text-align:center; + background-color:black; + border:1px solid white; + margin-left:auto; margin-right:auto; + display:table-cell; + vertical-align:middle; +} \ No newline at end of file diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/1280x800/music1.jpg Binary file www/m/img/1280x800/music1.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/1280x800/music2.jpg Binary file www/m/img/1280x800/music2.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/1280x800/music3.jpg Binary file www/m/img/1280x800/music3.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/1280x800/music4.jpg Binary file www/m/img/1280x800/music4.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/1280x800/music5.jpg Binary file www/m/img/1280x800/music5.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/1.png Binary file www/m/img/thumbs/1.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/2.png Binary file www/m/img/thumbs/2.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/3.png Binary file www/m/img/thumbs/3.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/4.png Binary file www/m/img/thumbs/4.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/5.png Binary file www/m/img/thumbs/5.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/6.png Binary file www/m/img/thumbs/6.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/img/thumbs/controls.html.png Binary file www/m/img/thumbs/controls.html.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/js/nodescore-client.js --- a/www/m/js/nodescore-client.js Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/js/nodescore-client.js Mon Jul 16 16:51:55 2012 +0100 @@ -111,13 +111,13 @@ function pageTurnB(unit) { var units=6; - var section = "seta/" +// var section = "seta/" var next=(((unit+1)%units)+units)%units console.log("HOP TURN" + unit+ "next:" + next); // $("#live").html($("#unit"+unit).html()); - $("#live").load(section+"music.html #"+unit +" *"); - - $("#preview").html(''); + $("#live").load("music.html #"+unit +" *"); + $("#preview").html("") +// $("#preview").html(''); } //////////////////////////////////////////////// diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/1280x800/music1.jpg Binary file www/m/seta/img/1280x800/music1.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/1280x800/music2.jpg Binary file www/m/seta/img/1280x800/music2.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/1280x800/music3.jpg Binary file www/m/seta/img/1280x800/music3.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/1280x800/music4.jpg Binary file www/m/seta/img/1280x800/music4.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/1280x800/music5.jpg Binary file www/m/seta/img/1280x800/music5.jpg has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/thumbs/1.png Binary file www/m/seta/img/thumbs/1.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/thumbs/2.png Binary file www/m/seta/img/thumbs/2.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/thumbs/3.png Binary file www/m/seta/img/thumbs/3.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/thumbs/4.png Binary file www/m/seta/img/thumbs/4.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/thumbs/5.png Binary file www/m/seta/img/thumbs/5.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/img/thumbs/6.png Binary file www/m/seta/img/thumbs/6.png has changed diff -r 8ac67b784a8c -r ac9641ecf84f www/m/seta/music.html --- a/www/m/seta/music.html Sun Jul 15 01:14:27 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - - - - - - - - - -
-
-
-
-
-
- - diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/13_6_2.svg --- a/www/m/svg/13_6_2.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/13_6_2.svg Mon Jul 16 16:51:55 2012 +0100 @@ -26,59 +26,59 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + - - - - - + + - - + 8va - - + + - - - + + - - - + + - - - + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/15_0_2.svg --- a/www/m/svg/15_0_2.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/15_0_2.svg Mon Jul 16 16:51:55 2012 +0100 @@ -25,94 +25,95 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/24_0_3.svg --- a/www/m/svg/24_0_3.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/24_0_3.svg Mon Jul 16 16:51:55 2012 +0100 @@ -28,98 +28,99 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + 8va - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/26_6_3.svg --- a/www/m/svg/26_6_3.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/26_6_3.svg Mon Jul 16 16:51:55 2012 +0100 @@ -25,40 +25,41 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/29_6_4.svg --- a/www/m/svg/29_6_4.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/29_6_4.svg Mon Jul 16 16:51:55 2012 +0100 @@ -28,54 +28,55 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - - - - - - - + + + + + - + 8vb - - - - - - - - + + + + + + + - - - + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/31_0_4.svg --- a/www/m/svg/31_0_4.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/31_0_4.svg Mon Jul 16 16:51:55 2012 +0100 @@ -27,86 +27,94 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/40_0_5.svg --- a/www/m/svg/40_0_5.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/40_0_5.svg Mon Jul 16 16:51:55 2012 +0100 @@ -25,115 +25,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 8va - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/42_6_5.svg --- a/www/m/svg/42_6_5.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/42_6_5.svg Mon Jul 16 16:51:55 2012 +0100 @@ -26,59 +26,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + - - - + + + + + + + + + + - - - - - - - - - - - + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/45_6_6.svg --- a/www/m/svg/45_6_6.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/45_6_6.svg Mon Jul 16 16:51:55 2012 +0100 @@ -25,47 +25,47 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + - - - + + - - - - - - - + + + + + + - - - + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/47_0_6.svg --- a/www/m/svg/47_0_6.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/47_0_6.svg Mon Jul 16 16:51:55 2012 +0100 @@ -27,116 +27,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/58_6_7.svg --- a/www/m/svg/58_6_7.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/58_6_7.svg Mon Jul 16 16:51:55 2012 +0100 @@ -28,57 +28,56 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + - - - + + - - - + + + 8va - - - - - - - - - + + + + + + + + - - - + + - + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/61_6_0.svg --- a/www/m/svg/61_6_0.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/61_6_0.svg Mon Jul 16 16:51:55 2012 +0100 @@ -27,61 +27,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + - - - + + - - - - - - - - + + - - - + + + + + + + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/72_0_1.svg --- a/www/m/svg/72_0_1.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/72_0_1.svg Mon Jul 16 16:51:55 2012 +0100 @@ -91,7 +91,8 @@ - + diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/74_6_1.svg --- a/www/m/svg/74_6_1.svg Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/74_6_1.svg Mon Jul 16 16:51:55 2012 +0100 @@ -36,39 +36,40 @@ - - - - + + + + - - - - + + + - - - - - - - - - - + + + + + + + + + - - - - - + + + + - diff -r 8ac67b784a8c -r ac9641ecf84f www/m/svg/svg-stylesheet.css --- a/www/m/svg/svg-stylesheet.css Sun Jul 15 01:14:27 2012 +0100 +++ b/www/m/svg/svg-stylesheet.css Mon Jul 16 16:51:55 2012 +0100 @@ -1,7 +1,7 @@ -svg { background-color: gray;} -line { stroke: red; } -text { fill: red;} -path { stroke: red; fill: red; } -rect { fill: red; } -circle { stroke: red; } +svg { background-color: black; width:1280px; height:800px;} +line { stroke: white; } +text { fill: white;} +path { stroke: white; fill: white; } +rect { fill: white; } +circle { stroke: white; }