# HG changeset patch
# User cavaliet
# Date 1413810019 -7200
# Node ID 33002744dbbd5c92ba2f437f6e0d9165d764ca4c
# Parent  7cff1f0a688202e0d0af7663074936f5efb1c9d8# Parent  8d2fb4ec85d780422af207a1e8425d82921eef1e
Merge with 8d2fb4ec85d780422af207a1e8425d82921eef1e

diff -r 8d2fb4ec85d7 -r 33002744dbbd annot-server/static/js/pianoroll.js
--- a/annot-server/static/js/pianoroll.js	Mon Oct 20 13:43:04 2014 +0200
+++ b/annot-server/static/js/pianoroll.js	Mon Oct 20 15:00:19 2014 +0200
@@ -8,7 +8,7 @@
 var sceneBgColor = 0xFFFFFF;
 var lineColor = 0x444444;
 //var manualFramerate = 24;
-var pixelsPerSecond1 = Math.floor(sceneWidth / 30); // nb of pixels per second
+var pixelsPerSecond1 = Math.floor(sceneWidth / 10); // nb of pixels per second
 var manualFramerate = pixelsPerSecond1 / 4;
 var pixelsPerSecond2 = Math.floor(sceneWidth / 60); // nb of pixels per second
 var lineInterval = 5000; // means line every 5 seconds
@@ -99,6 +99,16 @@
     container2.x -= pixelsPerSecond2/manualFramerate;
     renderer.render(stage);
 }
+function moveContainerMore() {
+    container1.x -= 10*(pixelsPerSecond1/manualFramerate);
+    container2.x -= 10*(pixelsPerSecond2/manualFramerate);
+    renderer.render(stage);
+}
+function moveContainerRight() {
+    container1.x += 10*(pixelsPerSecond1/manualFramerate);
+    container2.x += 10*(pixelsPerSecond2/manualFramerate);
+    renderer.render(stage);
+}
 
 function addBunny(data){
     var timeFromZero = data.content[1];
diff -r 8d2fb4ec85d7 -r 33002744dbbd annot-server/webapp/templates/pianoroll.html
--- a/annot-server/webapp/templates/pianoroll.html	Mon Oct 20 13:43:04 2014 +0200
+++ b/annot-server/webapp/templates/pianoroll.html	Mon Oct 20 15:00:19 2014 +0200
@@ -19,9 +19,14 @@
     <h1>OSC websocket Piano Roll Test</h1>
     <noscript>You must enable JavaScript</noscript>
     <div id="canvasContainer"></div>
-    <p><a href="#" onclick="clearInterval(moveInterval); clearInterval(verticalLinesInterval); return false;">stop intervals</a> - temps écoulé : <span id="myspan"></span></p>
+    <p>
+        <a href="#" onclick="clearInterval(moveInterval); clearInterval(verticalLinesInterval); return false;">stop intervals</a>
+         - temps écoulé : <span id="myspan"></span> - 
+        <a href="#" onclick="moveContainerMore(); return false;">Move Left</a> - 
+        <a href="#" onclick="moveContainerRight(); return false;">Move Right</a>
+     </p>
     <pre id="log"></pre>
-    <script src="{{ config['STATIC_URL'] }}js/pixi.js"></script>
-    <script src="{{ config['STATIC_URL'] }}js/pianoroll.js"></script>
+    <script src="{{ config['STATIC_URL'] }}/js/pixi.js"></script>
+    <script src="{{ config['STATIC_URL'] }}/js/pianoroll.js"></script>
 </body>
 </html>
diff -r 8d2fb4ec85d7 -r 33002744dbbd utils/export_annotations.py
--- a/utils/export_annotations.py	Mon Oct 20 13:43:04 2014 +0200
+++ b/utils/export_annotations.py	Mon Oct 20 15:00:19 2014 +0200
@@ -45,7 +45,7 @@
     if end_date:
         res.append({'name': 'ts', 'op': "<=", 'val':end_date.isoformat() })
     if events:
-        res.append({'name': 'event', 'op': "in", 'val':events })
+        res.append({'name': 'event_code', 'op': "in", 'val':events })
     if channels:
         res.append({'name': 'channel', 'op': "in", 'val':channels })
     if user_whitelist: