--- a/client/annotviz/app/annotsroll.html Wed Jan 21 20:16:31 2015 +0100
+++ b/client/annotviz/app/annotsroll.html Wed Jan 21 20:43:05 2015 +0100
@@ -50,7 +50,7 @@
logger: logger,
ws: new annotviz.WsWrapper(wsUriPianoroll, logger),
orientation: 'vertical',
- sceneHeight: 1080,
+ sceneHeight: 768,
pianorolls : [
{
height: 435,
@@ -66,10 +66,10 @@
logger: logger,
ws: new annotviz.WsWrapper(wsUriAnnotation, logger),
parentContainer: doubleroll.stage,
- xInit: 1920 - 435 - 300,
- yInit: 1080,
+ xInit: 1024 - 435 - 300,
+ yInit: 768,
width: 435 + 300,
- height: 1080,
+ height: 768,
widthRoll: 300,
framerate: doubleroll.framerate,
pixelsPerSecond: Math.floor(1920 / 60),
--- a/client/annotviz/app/annotstimeline.html Wed Jan 21 20:16:31 2015 +0100
+++ b/client/annotviz/app/annotstimeline.html Wed Jan 21 20:43:05 2015 +0100
@@ -49,8 +49,8 @@
ws: new annotviz.WsWrapper(wsUriAnnotation, logger),
xInit: 0,
yInit: 0,
- width: 1920 - 435 - 300,
- height: 1080,
+ width: 1024 - 435 - 300,
+ height: 768,
timeBegin: Date.now(),
timeEnd: Date.now() + 300000,
intervalWidth: 6,
--- a/client/annotviz/app/annotsvizview.html Wed Jan 21 20:16:31 2015 +0100
+++ b/client/annotviz/app/annotsvizview.html Wed Jan 21 20:43:05 2015 +0100
@@ -28,14 +28,14 @@
<script>
var pianorollChannel = 'PIANOROLL';
var annotationChannel = 'ANNOT';
- var eventCode = 'test_1';
+ var eventCode = 'atelier2_test';
var wsUri;
- if (window.location.protocol === 'file:') {
- wsUri = 'ws://127.0.0.1:8090/broadcast';
- }
- else {
- wsUri = 'ws://' + window.location.hostname + ':8090/broadcast';
- }
+// if (window.location.protocol === 'file:') {
+ wsUri = 'ws://172.16.0.20:8090/broadcast';
+// }
+// else {
+// wsUri = 'ws://' + window.location.hostname + ':8090/broadcast';
+// }
wsUriPianoroll = wsUri + '?channel=' + pianorollChannel + '&event_code=' + eventCode;
wsUriAnnotation = wsUri + '?channel=' + annotationChannel + '&event_code=' + eventCode;
--- a/client/annotviz/app/js/annotsvizview.js Wed Jan 21 20:16:31 2015 +0100
+++ b/client/annotviz/app/js/annotsvizview.js Wed Jan 21 20:43:05 2015 +0100
@@ -16,8 +16,8 @@
var defaultOptions = {
xInit: 0,
yInit: 0,
- width: 1080,
- height: 1920,
+ width: 1024,
+ height: 768,
};
function AnnotsVizView(options){
@@ -42,16 +42,16 @@
ws: new annotviz.WsWrapper(wsUriAnnotation, logger),
xInit: 0,
yInit: 0,
- width: 1920 - 435 - 300,
- height: 1080,
+ width: 1024 - 200 - 200,
+ height: 768,
timeBegin: Date.now(),
timeEnd: Date.now() + 300000,
intervalWidth: 6,
intervalHeight: 10,
maxCellHeight: 100,
- radius: 400,
- circleX:500,
- circleY:500,
+ radius: 200,
+ circleX:300,
+ circleY:400,
annotCategories: [{
ts: 0,
colors: {
@@ -78,10 +78,10 @@
logger: logger,
ws: wsPianoroll,
orientation: 'vertical',
- sceneHeight: 1080,
+ sceneHeight: 768,
pianorolls : [
{
- height: 300,
+ height: 200,
timeWidth: 60,
lineInterval: 5000,
noteHeight: undefined
@@ -94,11 +94,11 @@
logger: logger,
ws: wsAnnot,
parentContainer: doubleRollV.stage,
- xInit: 1920 - 300 - 300,
- yInit: 1080,
- width: 300 + 300,
- height: 1080,
- widthRoll: 300,
+ xInit: 1024 - 200 - 200,
+ yInit: 768,
+ width: 200 + 200,
+ height: 768,
+ widthRoll: 200,
framerate: doubleRollV.framerate,
pixelsPerSecond: Math.floor(1920 / 60),
annotColors: [{
--- a/client/annotviz/app/js/doubleroll.js Wed Jan 21 20:16:31 2015 +0100
+++ b/client/annotviz/app/js/doubleroll.js Wed Jan 21 20:43:05 2015 +0100
@@ -17,7 +17,7 @@
var defaultConfig = {
orientation: 'horizontal',
logger: undefined,
- sceneWidth: 1920,
+ sceneWidth: 1024,
pianorolls : [
{
height: 435,
--- a/client/annotviz/app/js/stageview.js Wed Jan 21 20:16:31 2015 +0100
+++ b/client/annotviz/app/js/stageview.js Wed Jan 21 20:43:05 2015 +0100
@@ -16,8 +16,8 @@
var defaultConfig = {
externalRefresh: false,
logger: undefined,
- sceneWidth: 1920,
- sceneHeight: 1080,
+ sceneWidth: 1024,
+ sceneHeight: 768,
framerate: 25,
sceneBgColor: 0xFFFFFF,
canvasContainer: 'canvasContainer',