--- a/annot-server/webapp/templates/annotviz.html Fri Apr 17 15:32:19 2015 +0200
+++ b/annot-server/webapp/templates/annotviz.html Sat Apr 18 09:37:57 2015 +0200
@@ -16,8 +16,8 @@
var pianorollChannel = 'PIANOROLL';
var annotationChannel = 'ANNOT';
var eventCode = '{{event.code}}';
- var eventCodeSessionDay2 = 'atelier3_jour1';
-// var eventCodeSessionDay1 = 'atelier3_jour1';
+ var eventCodeSessionDay2 = 'atelier3_jour2';
+ var eventCodeSessionDay1 = 'atelier3_jour1';
var wsUri = 'ws://' + window.location.hostname + ':8090/broadcast';
@@ -38,11 +38,11 @@
serverUrl: serverUrl,
wsPianoroll: new annotviz.WsWrapper(wsUriPianoroll, logger),
wsAnnot: new annotviz.WsWrapper(wsUriAnnotation, logger),
- timeBegin: Date.parse("2015-04-17T14:00:00+02:00"),
- timeEnd: Date.parse("2015-04-17T21:00:00+02:00"),
+ timeBegin: Date.parse("2015-04-18T10:00:00+02:00"),
+ timeEnd: Date.parse("2015-04-18T18:00:00+02:00"),
eventCode: eventCode,
eventCodeSessionDay2: eventCodeSessionDay2,
-// eventCodeSessionDay1: eventCodeSessionDay1,
+ eventCodeSessionDay1: eventCodeSessionDay1,
channel: annotationChannel
});
--- a/client/annot-client/gulpfile.js Fri Apr 17 15:32:19 2015 +0200
+++ b/client/annot-client/gulpfile.js Sat Apr 18 09:37:57 2015 +0200
@@ -50,18 +50,6 @@
.pipe(plugins.filesize());
});
-var vendorJSsrc = [
- '!./bower_components/**/*.min.js',
- '!./bower_components/bootstrap/Gruntfile.js',
- '!./bower_components/bootstrap/grunt/*',
- '!./bower_components/bootstrap/js/*',
- '!./bower_components/jquery/src/**/*',
- '!./bower_components/angular-bootstrap/ui-bootstrap.js',
- './bower_components/jquery/dist/jquery.js',
- './bower_components/angular/angular.js',
- './bower_components/**/*.js'
-];
-
gulp.task('vendorJS', function(){
//concatenate vendor JS files
return gulp.src(mainBowerFiles())
--- a/client/annotviz/app/js/annotsvizview.js Fri Apr 17 15:32:19 2015 +0200
+++ b/client/annotviz/app/js/annotsvizview.js Sat Apr 18 09:37:57 2015 +0200
@@ -82,8 +82,8 @@
yInit: 0,
width: 1024 - 200 - 200,
height: 768-200,
- timeBegin: Date.parse('2015-04-16T14:00:00+02:00'),
- timeEnd: Date.parse('2015-04-16T21:00:00+02:00'),
+ timeBegin: Date.parse('2015-04-17T14:00:00+02:00'),
+ timeEnd: Date.parse('2015-04-17T21:00:00+02:00'),
circleX: currentDay.circleX,
circleY: currentDay.circleY,
intervalWidth: (currentDay.radius*2/3)* currentDay.intervalWidth / currentDay.radius,