client/annotviz/app/js/annotsvizview.js
changeset 105 25ac8802c189
parent 104 685c5ebc59d0
child 108 082b64a5c699
--- a/client/annotviz/app/js/annotsvizview.js	Wed Jan 21 20:43:05 2015 +0100
+++ b/client/annotviz/app/js/annotsvizview.js	Thu Jan 22 02:21:15 2015 +0100
@@ -43,15 +43,13 @@
         xInit: 0,
         yInit: 0,
         width: 1024 - 200 - 200,
-        height: 768,
+        height: 768-200,
         timeBegin: Date.now(),
-        timeEnd: Date.now() + 300000,
+        timeEnd: Date.now() + 3000000,
         intervalWidth: 6,
         intervalHeight: 10,
-        maxCellHeight: 100,
+        maxCellHeight: 70,
         radius: 200,
-        circleX:300,
-        circleY:400,
         annotCategories: [{
        		ts: 0, 
        		colors: {		
@@ -71,20 +69,34 @@
        	}]
     });
 	
-	
+	var doubleRollH = new DoubleRoll.DoubleRoll({
+        stageView : stageView,
+    	logger: logger,
+        ws: wsPianoroll,
+        yInit: (this.height - 200),
+        sceneHeight: 200,
+        pianorolls : [
+            {
+                height: 200,
+                timeWidth: 10,
+                lineInterval: 5000,
+                noteHeight: 10
+            },
+        ]
+    });
 	
 	var doubleRollV = new DoubleRoll.DoubleRoll({
         stageView : stageView,
     	logger: logger,
         ws: wsPianoroll,
         orientation: 'vertical',
-        sceneHeight: 768,
+        sceneHeight: 768-200,
         pianorolls : [
             {
                 height: 200,
                 timeWidth: 60,
                 lineInterval: 5000,
-                noteHeight: undefined
+                noteHeight: 5,
             },
         ]
     });
@@ -95,12 +107,12 @@
         ws: wsAnnot,
         parentContainer: doubleRollV.stage,
         xInit: 1024 - 200 - 200,
-        yInit: 768,
+        yInit: 768-200,
         width: 200 + 200,
-        height: 768,
+        height: 768-200,
         widthRoll: 200,
         framerate: doubleRollV.framerate,
-        pixelsPerSecond: Math.floor(1920 / 60),
+        pixelsPerSecond: Math.floor(1024 / 60),
         annotColors: [{
         	ts: 0, 
         	colors: {		
@@ -118,21 +130,20 @@
 			}
         }]
     });
-
-	var limiter1 = new PIXI.Graphics()
-		.lineStyle(1, 0x000000)
+	
+	var limiters = new PIXI.Graphics()
+		.lineStyle(1, 0x646464)
 		.moveTo(annotsRoll.container.x, annotsRoll.container.y)
 		.lineTo(annotsRoll.container.x, annotsRoll.container.y - annotsRoll.height)
-		.endFill();
-	this.container.addChild(limiter1);
-	
-	var limiter2 = new PIXI.Graphics()
-		.lineStyle(1, 0x000000)
 		.moveTo(annotsRoll.container.x + annotsRoll.widthRoll, annotsRoll.container.y)
 		.lineTo(annotsRoll.container.x + annotsRoll.widthRoll, annotsRoll.container.y - annotsRoll.height)
+		.moveTo(0, this.height - 200)
+		.lineTo(this.width, this.height - 200)
+		.drawRect(0, 0, this.width -1, this.height -1)
+		.beginFill(0xECECEC)
+		.drawRect(1024 - 200, 0, 200, 768-200)
 		.endFill();
-	this.container.addChild(limiter2);
-	
+	this.container.addChild(limiters);
 	
 //	var doubleRollV = new DoubleRoll.DoubleRoll({});