diff -r 111350ddb81d -r 09a9074ea7b0 client/annotviz/app/js/main.js --- a/client/annotviz/app/js/main.js Fri Jan 16 13:33:18 2015 +0100 +++ b/client/annotviz/app/js/main.js Fri Jan 16 22:09:56 2015 +0100 @@ -140,11 +140,23 @@ var AnnotationRoll = new AnnotsRoll(uberContainer, sceneWidth - (prSize2 + prSize3), 0, prSize3 + prSize2, sceneHeight, prSize3, pixelsPerSecond3, lineInterval); +/* ---------------------------------------------------------------- */ +/* ------------------- Init generalView container ----------------- */ +/* ---------------------------------------------------------------- */ + +var GeneralView = require('./generalView.js') + +var GeneralRoll = new GeneralView(uberContainer, 0, 0, sceneWidth - (prSize2 + prSize3), sceneHeight, 3600, 60, Date.now()); + + function addAnnots(data){ var title = data.content.category.label; var user = data.content.user; + //Test cat and color var colorAnnot = 0x65A954; + AnnotationRoll.addAnnot(title, user, colorAnnot); + GeneralRoll.addAnnot(title, Date.now()); } /* ---------------------------------------------------------------- */ @@ -232,6 +244,7 @@ if(logger){ log('Got message: ' + e.data); } + console.log(e); addAnnots(JSON.parse(e.data)); }; }