changeset 17:49cfd3ad1fe7

update safari

--- a/mcserver/static/app.js	Fri Jun 22 14:57:41 2012 +0100
+++ b/mcserver/static/app.js	Fri Jun 22 15:01:16 2012 +0100
@@ -1,13 +1,29 @@
 var Application = {
+  moods: [
+    ['power',0.69,0.71,0.79,1],
+    ['bright',0.81,0.55,0.67,2],
+    ['brutal',0.23,0.7,0.45,3],
+    ['confused',0.28,0.63,0.41,4],
+    ['rock',0.57,0.44,0.52,5],
+    ['serious',0.51,0.38,0.52,6],
+    ['relaxed',0.75,0.17,0.57,7],
+    ['calm',0.72,0.33,0.67,8],
+    ['dark',0.46,0.41,0.48,9],
+    ['dirty',0.26,0.49,0.46,10],
+    ['energy',0.78,0.74,0.74,11],
+    ['fun',0.92,0.78,0.73,12],
+    ['aggressive',0.51,0.6,0.57,13],
+    ['scary',0.28,0.71,0.33,14],
+    ['positive',0.88,0.57,0.65,15],
+    ['sad',0.08,0.39,0.31,16]
+  ],
+ 
   init: function() {
     this.canvas = document.getElementById('canvas');
-    this.marker = document.getElementById('marker');
     this.label = document.getElementById('label');
+    this.draw();
 
     this.canvas.addEventListener('click', this.onMouseUp.bind(this));
-    
-    this.request("/moodconductor/moods.csv", this.loadMoods.bind(this));
-    this.draw();
   },
 
   tl: { r: 200, g: 0, b: 0 },
@@ -80,23 +96,6 @@
       ctx.fill();
     }
   },
-
-  loadMoods: function(text) {
-    this.moods = [];
-
-    var lines = text.split("\n");
-    
-    for (var i = 1; i < lines.length; i++) {
-      var row = lines[i].split(",");
-      var mood = {
-        label: row[0],
-        val: Number(row[1]), 
-        aro: Number(row[2]),
-        dom: Number(row[3])
-      };
-      this.moods.push(mood);
-    }
-  },
  
   request: function(url, callback) {
     var request = new XMLHttpRequest();
@@ -131,11 +130,8 @@
 
     var x = event.pageX / 320;
     var y = 1 - event.pageY / 320;
-    
-    var mood = this.findMood(x, y);
 
-    this.label.innerHTML = mood.label;
-    this.mood = mood;
+    this.label.innerHTML = this.findMood(x, y);
   },
 
   findMood: function(x, y) {
@@ -144,8 +140,8 @@
     
     for (var i = 0; i < this.moods.length; i++) {
       var mood = this.moods[i];
-      var dx = Math.abs(mood.val - x);
-      var dy = Math.abs(mood.aro - y);
+      var dx = Math.abs(mood[1] - x);
+      var dy = Math.abs(mood[2] - y);
       var d = Math.sqrt(dx * dx + dy * dy);
 
       if (d < distance) {
@@ -154,6 +150,6 @@
       }
     }
 
-    return this.moods[index];
+    return this.moods[index][0];
   }
 };