diff -r 8546e2181a73 -r e4f0c105090d annot-server/static/js/annotviz.min.js --- a/annot-server/static/js/annotviz.min.js Thu Jan 22 08:07:09 2015 +0100 +++ b/annot-server/static/js/annotviz.min.js Thu Jan 22 08:28:11 2015 +0100 @@ -1,1 +1,1 @@ -!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var i;"undefined"!=typeof window?i=window:"undefined"!=typeof global?i=global:"undefined"!=typeof self&&(i=self),i.annotviz=t()}}(function(){return function t(i,e,n){function o(r,a){if(!e[r]){if(!i[r]){var h="function"==typeof require&&require;if(!a&&h)return h(r,!0);if(s)return s(r,!0);var l=new Error("Cannot find module '"+r+"'");throw l.code="MODULE_NOT_FOUND",l}var c=e[r]={exports:{}};i[r][0].call(c.exports,function(t){var e=i[r][1][t];return o(e?e:t)},c,c.exports,t,i,e,n)}return e[r].exports}for(var s="function"==typeof require&&require,r=0;rDate.parse(t.ts)){var e=Math.floor((Date.parse(t.ts)-this.timeBegin)/(1e3*this.intervalDuration));this.cells[e].categories[i].count+=1,this.cells[e].totalAnnots+=1,this.redrawCell(this.cells[e],e)}},this.initGraphics=function(t){t.graphics=new n.Graphics,t.graphics.position.x=this.circleX+this.radius*Math.sin(t.i*(360/h)*(Math.PI/180)),t.graphics.position.y=this.circleY-this.radius*Math.cos(t.i*(360/h)*(Math.PI/180)),t.graphics.rotation=t.i*(360/h)*(Math.PI/180)+360/(2*h)*(Math.PI/180),this.container.addChild(t.graphics)},this.initTimeTexts=function(){var t=new n.Text(o.formatTime(this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});t.x=this.circleX+15,t.y=this.circleY-this.radius-this.maxCellHeight-10,this.container.addChild(t);var i=new n.Text(o.formatTime(this.timeEnd),{font:"12pt Gothic Standard",fill:"#646464"});i.x=this.circleX-15-i.width,i.y=this.circleY-this.radius-this.maxCellHeight-10,this.container.addChild(i);var e=new n.Text(o.formatTime((this.timeEnd-this.timeBegin)/4+this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});e.x=this.circleX+this.radius+this.maxCellHeight+10,e.y=this.circleY-e.height,e.rotation=Math.PI/2,this.container.addChild(e);var s=new n.Text(o.formatTime((this.timeEnd-this.timeBegin)/2+this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});s.x=this.circleX-s.width/2,s.y=this.circleY+this.radius+this.maxCellHeight-2,this.container.addChild(s);var r=new n.Text(o.formatTime(3*(this.timeEnd-this.timeBegin)/4+this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});r.x=this.circleX-this.radius-this.maxCellHeight-10,r.y=this.circleY+e.height,r.rotation=-Math.PI/2,this.container.addChild(r)},this.redrawCell=function(t){"undefined"==typeof t.graphics?this.initGraphics(t):t.graphics.clear();var i=0;if(t.totalAnnots*this.intervalHeight>this.maxCellHeight)var e=this.maxCellHeight/t.totalAnnots;else var e=this.intervalHeight;for(var n=0;ni?"0"+i:i)+":"+(10>e?"0"+e:e)+":"+(10>n?"0"+n:n);u.setText(o)};var v;return this.start=function(){v=setInterval(function(){i.updateTime()},1e3)},this.refresh=function(){},this.stop=function(){console.log(this.cells)},this}var n=t("pixi"),o=t("./utils.js"),s=t("lodash"),r={logger:void 0,intervalWidth:10,intervalHeight:5,maxCellHeight:200,radius:300};i.exports={AnnotsTimeLine:e}},{"./utils.js":9,lodash:"lodash",pixi:"pixi"}],4:[function(t,i){"use strict";function e(t){var i=o(t).defaults(h).value();this.container=new n.DisplayObjectContainer,this.container.x=i.xInit,this.container.y=i.yInit,this.width=i.width,this.height=i.height,this.annotCategories=i.annotCategories;var e=i.wsPianoroll,l=i.wsAnnot,c=i.stageView;c.registerComponent(this);var d=(new r.AnnotsTimeLine({stageView:c,logger:logger,ws:new annotviz.WsWrapper(wsUriAnnotation,logger),xInit:0,yInit:0,width:624,height:568,timeBegin:Date.now(),timeEnd:Date.now()+3e6,intervalWidth:6,intervalHeight:10,maxCellHeight:70,radius:200,annotCategories:this.annotCategories}),new s.DoubleRoll({stageView:c,logger:logger,ws:e,yInit:this.height-200,sceneHeight:200,pianorolls:[{height:200,timeWidth:10,lineInterval:5e3,noteHeight:10}]}),new s.DoubleRoll({stageView:c,logger:logger,ws:e,orientation:"vertical",sceneHeight:568,pianorolls:[{height:200,timeWidth:60,lineInterval:5e3,noteHeight:5}]})),f=new a.AnnotsRoll({stageView:c,logger:logger,ws:l,parentContainer:d.stage,xInit:624,yInit:568,width:400,height:568,widthRoll:200,framerate:d.framerate,pixelsPerSecond:Math.floor(1024/60),annotColors:this.annotCategories}),g=(new n.Graphics).lineStyle(1,6579300).moveTo(f.container.x,f.container.y).lineTo(f.container.x,f.container.y-f.height).moveTo(f.container.x+f.widthRoll,f.container.y).lineTo(f.container.x+f.widthRoll,f.container.y-f.height).moveTo(0,this.height-200).lineTo(this.width,this.height-200).drawRect(0,0,this.width-1,this.height-1).beginFill(15527148).drawRect(824,0,200,568).endFill();return this.container.addChild(g),this.init=function(){},this.start=function(){},this.refresh=function(){},this.stop=function(){},this}var n=t("pixi"),o=t("lodash"),s=t("./doubleroll.js"),r=t("./annotstimeline.js"),a=t("./annotsroll.js"),h={xInit:0,yInit:0,width:1024,height:768,annotCategories:[{ts:0,colors:{ntm:"#CDC83F",iam:"#CDC83F",hip:"#CDC83F",hop:"#CDC83F",rock:"#DE8B53",rap:"#DE8B53",classic:"#DE8B53",drums:"#C5A3CA",guitar:"#C5A3CA",bass:"#79BB92","default":"#808080"},order:["ntm","iam","hip","hop","rock","rap","classic","drums","guitar","bass","default"]}]};i.exports={AnnotsVizView:e}},{"./annotsroll.js":2,"./annotstimeline.js":3,"./doubleroll.js":5,lodash:"lodash",pixi:"pixi"}],5:[function(t,i){"use strict";function e(t){var i=this,e=o(t).defaults(r).value(),a=e.orientation,h="vertical"!==a;this.logger=e.logger,this.lineColor=e.lineColor,this.lineFillColor=e.lineFillColor,this.framerate=e.framerate,this.offsetMusic=e.offsetMusic,this.noteColors=e.noteColors;var l=e.noteHeight,c=(e.sceneBgColor,e.sceneHeight||o(e.pianorolls).reduce(function(t,i){return t+i.height},0)),d=e.timeWidth,f=e.lineInterval,g=e.offsetMusic,u=e.sceneWidth,v=e.stageView,p=e.zeroShift,w=e.ws,m={};this.container=new n.DisplayObjectContainer,this.container.x=Math.floor(u*p),this.container.y=0,v.registerComponent(this);var C=[],x={parentContainer:this.container,orientation:a,xInit:0,width:u,noteColors:this.noteColors,colorsReg:m,lineColor:this.lineColor,lineInterval:f,offsetMusic:g},y=e.yInit||0,I=!0;o(e.pianorolls).forEach(function(t,r){var a=l||t.noteHeight||t.height/128,h=t.timeWidth||d;if(C.push(new s(o({yInit:y,height:t.height,linesDown:I,pixelsPerSecond:Math.floor(u/h),noteHeight:a,lineInterval:t.lineInterval}).defaults(x).value())),y+=t.height,I=!I,rs?"0"+s:s)+":"+(10>r?"0"+r:r)+":"+(10>h?"0"+h:h),c={font:"10pt Arial",fill:"#444444"},d=new n.Text(l,c);a?(d.x=i+2,d.y=this.linesDown?this.height-15:2):(d.rotation=-Math.PI/2,d.x=i,d.y=this.linesDown?this.height-2:d.width+2),this.container.addChild(d)},this.moveTo=function(t){var i=this.container.x;this.container.x=Math.floor(t*this.pixelsPerSecond);var e=Math.abs(i-this.container.x);s.forOwn(this.noteDict,function(t){s.forOwn(t,function(t){t.graphics&&(t.graphics.width=t.graphics.width+e)})})},this.move=function(){var t=(this.startTs-Date.now())/1e3;this.moveTo(t)},this.removePassedObjets=function(){var t=[];s(i.container.children).forEach(function(i){return"undefined"==typeof i||l(i)&&t.push(i)}),t.forEach(function(t){i.container.removeChild(t)})},this.start=function(){h||(this.startTs=Date.now(),this.addLine(),h=!0),this.verticalLinesInterval=setInterval(function(){i.addLine()},this.lineInterval),this.cleanInterval=setInterval(function(){i.removePassedObjets()},1e3*this.width/this.pixelsPerSecond)},this.stop=function(){clearInterval(this.verticalLinesInterval),clearInterval(this.cleanInterval)}}var n=t("pixi"),o=t("randomColor"),s=t("lodash"),r=2208988800;i.exports=e},{lodash:"lodash",pixi:"pixi",randomColor:"randomColor"}],8:[function(t,i){"use strict";function e(t){var i=this,e=o(t).defaults(s).value(),r=e.externalRefresh;this.logger=e.logger,this.framerate=e.framerate;var a=e.sceneBgColor,h=e.sceneWidth,l=e.sceneHeight,c=e.canvasContainer,d=[],f=[];this.stage=new n.Stage(a);var g=n.autoDetectRenderer(h,l);this.init=function(){"string"==typeof c&&(c=document.getElementById(c)),"string"==typeof d&&(d=document.getElementById(d)),c.appendChild(g.view),f.forEach(function(t){t.init()})},this.registerTimeContainer=function(t){d.push(t)},this.registerComponent=function(t){f.push(t),this.stage.addChild(t.container)},this.refresh=function(){f.forEach(function(t){t.refresh()}),g.render(this.stage)};var u;return this.start=function(){r||(u=setInterval(function(){i.refresh()},1e3/this.framerate)),f.forEach(function(t){t.start()})},this.stop=function(){r||clearInterval(u),clearInterval(refreshTimeInterval),f.forEach(function(t){t.stop()})},this.log=function(t){this.logger&&this.logger.log(t)},this}var n=t("pixi"),o=t("lodash"),s={externalRefresh:!1,logger:void 0,sceneWidth:1024,sceneHeight:768,framerate:25,sceneBgColor:16777215,canvasContainer:"canvasContainer"};i.exports={StageView:e}},{lodash:"lodash",pixi:"pixi"}],9:[function(t,i){"use strict";function e(t){var i=Math.floor(t/1e3/3600)%24,e=Math.floor(t/1e3/60)%60,n=Math.floor(t/1e3%60);return(10>i?"0"+i:i)+":"+(10>e?"0"+e:e)+":"+(10>n?"0"+n:n)}i.exports={formatTime:e}},{}],10:[function(t,i){"use strict";function e(t,i){var e=t,n=new WebSocket(e),o=i,s=function(t){o&&o.log(t)},r=[];n.onopen=function(){s("Connected to "+e)},n.onclose=function(t){s("Connection closed (wasClean = "+t.wasClean+", code = "+t.code+", reason = '"+t.reason+"')"),n=null},n.onmessage=function(t){s("received "+t.data);var i=JSON.parse(t.data);r.forEach(function(t){t(i)})},this.message=function(t){t&&r.push(t)}}i.exports={WsWrapper:e}},{}]},{},[1])(1)}); \ No newline at end of file +!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var i;"undefined"!=typeof window?i=window:"undefined"!=typeof global?i=global:"undefined"!=typeof self&&(i=self),i.annotviz=t()}}(function(){return function t(i,e,n){function o(r,a){if(!e[r]){if(!i[r]){var h="function"==typeof require&&require;if(!a&&h)return h(r,!0);if(s)return s(r,!0);var l=new Error("Cannot find module '"+r+"'");throw l.code="MODULE_NOT_FOUND",l}var c=e[r]={exports:{}};i[r][0].call(c.exports,function(t){var e=i[r][1][t];return o(e?e:t)},c,c.exports,t,i,e,n)}return e[r].exports}for(var s="function"==typeof require&&require,r=0;rDate.parse(t.ts)){var e=Math.floor((Date.parse(t.ts)-this.timeBegin)/(1e3*this.intervalDuration));this.cells[e].categories[i].count+=1,this.cells[e].totalAnnots+=1,this.redrawCell(this.cells[e],e)}},this.initGraphics=function(t){t.graphics=new n.Graphics,t.graphics.position.x=this.circleX+this.radius*Math.sin(t.i*(360/h)*(Math.PI/180)),t.graphics.position.y=this.circleY-this.radius*Math.cos(t.i*(360/h)*(Math.PI/180)),t.graphics.rotation=t.i*(360/h)*(Math.PI/180)+360/(2*h)*(Math.PI/180),this.container.addChild(t.graphics)},this.initTimeTexts=function(){var t=new n.Text(o.formatTime(this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});t.x=this.circleX+15,t.y=this.circleY-this.radius-this.maxCellHeight-10,this.container.addChild(t);var i=new n.Text(o.formatTime(this.timeEnd),{font:"12pt Gothic Standard",fill:"#646464"});i.x=this.circleX-15-i.width,i.y=this.circleY-this.radius-this.maxCellHeight-10,this.container.addChild(i);var e=new n.Text(o.formatTime((this.timeEnd-this.timeBegin)/4+this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});e.x=this.circleX+this.radius+this.maxCellHeight+10,e.y=this.circleY-e.height,e.rotation=Math.PI/2,this.container.addChild(e);var s=new n.Text(o.formatTime((this.timeEnd-this.timeBegin)/2+this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});s.x=this.circleX-s.width/2,s.y=this.circleY+this.radius+this.maxCellHeight-2,this.container.addChild(s);var r=new n.Text(o.formatTime(3*(this.timeEnd-this.timeBegin)/4+this.timeBegin),{font:"12pt Gothic Standard",fill:"#646464"});r.x=this.circleX-this.radius-this.maxCellHeight-10,r.y=this.circleY+e.height,r.rotation=-Math.PI/2,this.container.addChild(r)},this.redrawCell=function(t){"undefined"==typeof t.graphics?this.initGraphics(t):t.graphics.clear();var i=0;if(t.totalAnnots*this.intervalHeight>this.maxCellHeight)var e=this.maxCellHeight/t.totalAnnots;else var e=this.intervalHeight;for(var n=0;ni?"0"+i:i)+":"+(10>e?"0"+e:e)+":"+(10>n?"0"+n:n);u.setText(o)};var v;return this.start=function(){v=setInterval(function(){i.updateTime()},1e3)},this.refresh=function(){},this.stop=function(){console.log(this.cells)},this}var n=t("pixi"),o=t("./utils.js"),s=t("lodash"),r={logger:void 0,intervalWidth:10,intervalHeight:5,maxCellHeight:200,radius:300};i.exports={AnnotsTimeLine:e}},{"./utils.js":9,lodash:"lodash",pixi:"pixi"}],4:[function(t,i){"use strict";function e(t){var i=o(t).defaults(h).value();this.container=new n.DisplayObjectContainer,this.container.x=i.xInit,this.container.y=i.yInit,this.width=i.width,this.height=i.height,this.annotCategories=i.annotCategories;var e=i.wsPianoroll,l=i.wsAnnot,c=i.stageView;c.registerComponent(this);var d=(new r.AnnotsTimeLine({stageView:c,logger:logger,ws:new annotviz.WsWrapper(wsUriAnnotation,logger),xInit:0,yInit:0,width:624,height:568,timeBegin:Date.now(),timeEnd:Date.now()+3e6,intervalWidth:6,intervalHeight:10,maxCellHeight:70,radius:200,annotCategories:this.annotCategories}),new s.DoubleRoll({stageView:c,logger:logger,ws:e,yInit:this.height-200,sceneHeight:200,pianorolls:[{height:200,timeWidth:10,lineInterval:5e3,noteHeight:10}]}),new s.DoubleRoll({stageView:c,logger:logger,ws:e,orientation:"vertical",sceneHeight:568,pianorolls:[{height:200,timeWidth:60,lineInterval:5e3,noteHeight:5}]})),f=new a.AnnotsRoll({stageView:c,logger:logger,ws:l,parentContainer:d.stage,xInit:624,yInit:568,width:400,height:568,widthRoll:200,framerate:d.framerate,pixelsPerSecond:Math.floor(1024/60),annotColors:this.annotCategories}),g=(new n.Graphics).lineStyle(1,6579300).moveTo(f.container.x,f.container.y).lineTo(f.container.x,f.container.y-f.height).moveTo(f.container.x+f.widthRoll,f.container.y).lineTo(f.container.x+f.widthRoll,f.container.y-f.height).moveTo(0,this.height-200).lineTo(this.width,this.height-200).drawRect(0,0,this.width-1,this.height-1).beginFill(15527148).drawRect(824,0,200,568).endFill();return this.container.addChild(g),this.init=function(){},this.start=function(){},this.refresh=function(){},this.stop=function(){},this}var n=t("pixi"),o=t("lodash"),s=t("./doubleroll.js"),r=t("./annotstimeline.js"),a=t("./annotsroll.js"),h={xInit:0,yInit:0,width:1024,height:768,annotCategories:[{ts:1421928213e3,colors:{transgressions:"#b90000",rythmique:"#af931e",narration:"#4bdd71",relation:"#1c28ba"},order:["transgressions","rythmique","narration","relation"],defaultColor:"#536991"}]};i.exports={AnnotsVizView:e}},{"./annotsroll.js":2,"./annotstimeline.js":3,"./doubleroll.js":5,lodash:"lodash",pixi:"pixi"}],5:[function(t,i){"use strict";function e(t){var i=this,e=o(t).defaults(r).value(),a=e.orientation,h="vertical"!==a;this.logger=e.logger,this.lineColor=e.lineColor,this.lineFillColor=e.lineFillColor,this.framerate=e.framerate,this.offsetMusic=e.offsetMusic,this.noteColors=e.noteColors;var l=e.noteHeight,c=(e.sceneBgColor,e.sceneHeight||o(e.pianorolls).reduce(function(t,i){return t+i.height},0)),d=e.timeWidth,f=e.lineInterval,g=e.offsetMusic,u=e.sceneWidth,v=e.stageView,p=e.zeroShift,w=e.ws,m={};this.container=new n.DisplayObjectContainer,this.container.x=Math.floor(u*p),this.container.y=0,v.registerComponent(this);var x=[],C={parentContainer:this.container,orientation:a,xInit:0,width:u,noteColors:this.noteColors,colorsReg:m,lineColor:this.lineColor,lineInterval:f,offsetMusic:g},y=e.yInit||0,I=!0;o(e.pianorolls).forEach(function(t,r){var a=l||t.noteHeight||t.height/128,h=t.timeWidth||d;if(x.push(new s(o({yInit:y,height:t.height,linesDown:I,pixelsPerSecond:Math.floor(u/h),noteHeight:a,lineInterval:t.lineInterval}).defaults(C).value())),y+=t.height,I=!I,rs?"0"+s:s)+":"+(10>r?"0"+r:r)+":"+(10>h?"0"+h:h),c={font:"10pt Arial",fill:"#444444"},d=new n.Text(l,c);a?(d.x=i+2,d.y=this.linesDown?this.height-15:2):(d.rotation=-Math.PI/2,d.x=i,d.y=this.linesDown?this.height-2:d.width+2),this.container.addChild(d)},this.moveTo=function(t){var i=this.container.x;this.container.x=Math.floor(t*this.pixelsPerSecond);var e=Math.abs(i-this.container.x);s.forOwn(this.noteDict,function(t){s.forOwn(t,function(t){t.graphics&&(t.graphics.width=t.graphics.width+e)})})},this.move=function(){var t=(this.startTs-Date.now())/1e3;this.moveTo(t)},this.removePassedObjets=function(){var t=[];s(i.container.children).forEach(function(i){return"undefined"==typeof i||l(i)&&t.push(i)}),t.forEach(function(t){i.container.removeChild(t)})},this.start=function(){h||(this.startTs=Date.now(),this.addLine(),h=!0),this.verticalLinesInterval=setInterval(function(){i.addLine()},this.lineInterval),this.cleanInterval=setInterval(function(){i.removePassedObjets()},1e3*this.width/this.pixelsPerSecond)},this.stop=function(){clearInterval(this.verticalLinesInterval),clearInterval(this.cleanInterval)}}var n=t("pixi"),o=t("randomColor"),s=t("lodash"),r=2208988800;i.exports=e},{lodash:"lodash",pixi:"pixi",randomColor:"randomColor"}],8:[function(t,i){"use strict";function e(t){var i=this,e=o(t).defaults(s).value(),r=e.externalRefresh;this.logger=e.logger,this.framerate=e.framerate;var a=e.sceneBgColor,h=e.sceneWidth,l=e.sceneHeight,c=e.canvasContainer,d=[],f=[];this.stage=new n.Stage(a);var g=n.autoDetectRenderer(h,l);this.init=function(){"string"==typeof c&&(c=document.getElementById(c)),"string"==typeof d&&(d=document.getElementById(d)),c.appendChild(g.view),f.forEach(function(t){t.init()})},this.registerTimeContainer=function(t){d.push(t)},this.registerComponent=function(t){f.push(t),this.stage.addChild(t.container)},this.refresh=function(){f.forEach(function(t){t.refresh()}),g.render(this.stage)};var u;return this.start=function(){r||(u=setInterval(function(){i.refresh()},1e3/this.framerate)),f.forEach(function(t){t.start()})},this.stop=function(){r||clearInterval(u),clearInterval(refreshTimeInterval),f.forEach(function(t){t.stop()})},this.log=function(t){this.logger&&this.logger.log(t)},this}var n=t("pixi"),o=t("lodash"),s={externalRefresh:!1,logger:void 0,sceneWidth:1024,sceneHeight:768,framerate:25,sceneBgColor:16777215,canvasContainer:"canvasContainer"};i.exports={StageView:e}},{lodash:"lodash",pixi:"pixi"}],9:[function(t,i){"use strict";function e(t){var i=Math.floor(t/1e3/3600)%24,e=Math.floor(t/1e3/60)%60,n=Math.floor(t/1e3%60);return(10>i?"0"+i:i)+":"+(10>e?"0"+e:e)+":"+(10>n?"0"+n:n)}i.exports={formatTime:e}},{}],10:[function(t,i){"use strict";function e(t,i){var e=t,n=new WebSocket(e),o=i,s=function(t){o&&o.log(t)},r=[];n.onopen=function(){s("Connected to "+e)},n.onclose=function(t){s("Connection closed (wasClean = "+t.wasClean+", code = "+t.code+", reason = '"+t.reason+"')"),n=null},n.onmessage=function(t){s("received "+t.data);var i=JSON.parse(t.data);r.forEach(function(t){t(i)})},this.message=function(t){t&&r.push(t)}}i.exports={WsWrapper:e}},{}]},{},[1])(1)}); \ No newline at end of file