comparison mcserver/static/app.js~ @ 12:9d9169751aba

new server

   init: function() {
     this.canvas = document.getElementById('canvas');
     this.marker = document.getElementById('marker');
     this.label = document.getElementById('label');
 
-    this.canvas.addEventListener('mousedown', this.onMouseDown.bind(this));
-    this.canvas.addEventListener('mousemove', this.onMouseMove.bind(this));
-    this.canvas.addEventListener('mouseup', this.onMouseUp.bind(this));
+    this.canvas.addEventListener('click', this.onMouseUp.bind(this));
     
-    this.request("/moods.csv", this.loadMoods.bind(this));
+    this.request("/moodconductor/moods.csv", this.loadMoods.bind(this));
+<<<<<<< local
     this.background();
+=======
+    this.draw();
+>>>>>>> other
   },
 
   tl: { r: 200, g: 0, b: 0 },
   tr: { r: 200, g: 150, b: 0 },
   bl: { r: 0, g: 50, b: 100 },

       g: Math.floor(a.g + (b.g - a.g) * x),
       b: Math.floor(a.b + (b.b - a.b) * x)
     };
   },
 
-  background: function() {
+  draw: function() {
     var step = 20;
     var ctx = this.canvas.getContext("2d");  
     ctx.clearRect(0, 0, 320, 320);
 
     for (var y = 0; y < 320; y += step) {

         var color = this.interpolateColor(left, right, x / 320);
         ctx.fillStyle = "rgb(" + color.r + "," + color.g + "," + color.b + ")";
         ctx.fillRect(x, y, step, step);
       }
     }
+
+    ctx.beginPath();
     ctx.strokeStyle = "rgb(0,0,0)";
     ctx.moveTo(0, 160);
     ctx.lineTo(320, 160);
     ctx.stroke();
     

     ctx.translate(158, 120);
     ctx.rotate(Math.PI * 1.5);
     ctx.font = "16px Arial";
     ctx.fillText("Arousal", 0, 0);  
     ctx.restore();
+ 
+    if (this.marker) {
+      ctx.fillStyle = "rgba(0, 0, 0, 0.5)";
+      ctx.beginPath();
+      ctx.arc(this.marker.x, this.marker.y, 20, 0, Math.PI*2, true); 
+      ctx.fill();
+    }
   },
 
   loadMoods: function(text) {
     this.moods = [];
 

     }.bind(this);
     request.open("GET", url);
     request.send(null);
   },
 
-  onMouseDown: function(event) {
-    this.mouseDown = true;
-    this.setMarker(event.pageX, event.pageY);
+  onMouseUp: function(event) {
+    event.preventDefault();
+    this.setMarker(event);
+    this.sendPosition(event);
+    this.draw();
   },
 
-  onMouseMove: function(event) {
-    if (this.mouseDown) {
-      this.setMarker(event.pageX, event.pageY);
-    }
+  sendPosition: function(event) {
+    var x = event.pageX / 320;
+    var y = 1 - event.pageY / 320;
+
+    this.request("/moodconductor/mood?x=" + x + "&y=" + y);
   },
 
-  onMouseUp: function(event) {
-    this.mouseDown = false;
-    this.setMarker(event.pageX, event.pageY);
+  setMarker: function(event) {
+    this.marker = {
+      x: event.pageX,
+      y: event.pageY
+    };
+
+<<<<<<< local
+  sendPosition: function(pageX, pageY) {
+    var x = pageX / 320;
+    var y = 1 - pageY / 320;
+    this.request("/moodconductor/mood?x=" + x + "&y=" + y);
   },
 
   setMarker: function(pageX, pageY) {
     this.background();
     this.drawMarker(pageX, pageY);
 
     var x = pageX / 320;
     var y = 1 - pageY / 320;
+=======
+    var x = event.pageX / 320;
+    var y = 1 - event.pageY / 320;
+>>>>>>> other
     
     var mood = this.findMood(x, y);
 
-    if (mood != this.mood) {
-      this.label.innerHTML = mood.label;
-      this.mood = mood;
-      this.request("/mood?x=" + x + "&y=" + y);
-    }
-  },
-  
-  drawMarker: function(x, y) {
-    var ctx = this.canvas.getContext("2d");  
-    ctx.fillStyle = "rgba(0, 0, 0, 0.5)";
-    ctx.beginPath();
-    ctx.arc(x, y, 20, 0, Math.PI*2, true); 
-    ctx.fill();
+    this.label.innerHTML = mood.label;
+    this.mood = mood;
   },
 
   findMood: function(x, y) {
     var distance = 1;
     var index = null;