clean code map

diff --git a/plugins/senslabmap/static/js/map.js b/plugins/senslabmap/static/js/map.js
index f37a14e..df29b88 100644 (file)
--- a/plugins/senslabmap/static/js/map.js
+++ b/plugins/senslabmap/static/js/map.js
@@ -13,11 +13,7 @@ var Senslab = {
       node.arch = info[0].split("-")[0];
       node.id = info[0].split("-")[1];
       node.site = info[1];
       node.arch = info[0].split("-")[0];
       node.id = info[0].split("-")[1];
       node.site = info[1];

-      return true;
-    } else {
-      console.warn("could not normalize node :");
-      console.warn(node);
-      return false;
+      node.normalized = true;

     }
   }
 };
     }
   }
 };


@@ -30,10 +26,6 @@ Senslab.Map = function() {
     "Selected": 0x0099CC
   };
 
     "Selected": 0x0099CC
   };
 

-  function setColor(node) {
-    node.material.color.setHex(colors[node.boot_state] || colors["Selected"]);
-  }
-  

   var archs = [
     "wsn430",
     "m3",
   var archs = [
     "wsn430",
     "m3",


@@ -48,10 +40,6 @@ Senslab.Map = function() {
     this.phi = -100;
     this.theta = 0;
     this.onRot = false;
     this.phi = -100;
     this.theta = 0;
     this.onRot = false;

-
-    this._notify = function(node) {
-      console.log("[Notify] node " + node.id + " is " + node.boot_state);
-    };

     
     this.pointerDetectRay = new THREE.Raycaster();
     this.pointerDetectRay.ray.direction.set(0, -1, 0);
     
     this.pointerDetectRay = new THREE.Raycaster();
     this.pointerDetectRay.ray.direction.set(0, -1, 0);


@@ -76,7 +64,8 @@ Senslab.Map = function() {
       self.$nodeInputs[arch] = $("<input type='text' placeholder='" + arch + "'>")
       .appendTo($container)
       .change(function() {
       self.$nodeInputs[arch] = $("<input type='text' placeholder='" + arch + "'>")
       .appendTo($container)
       .change(function() {

-        self.updateColor(arch, expand($(this).val()));
+        self.updateSelected(arch, expand($(this).val()));
+        self.update();

       });
     });
     
       });
     });
     


@@ -108,9 +97,7 @@ Senslab.Map = function() {
           if (intersects.length > 0) {
             var node = intersects[0].object;
             if (node.boot_state != "Suspected") {
           if (intersects.length > 0) {
             var node = intersects[0].object;
             if (node.boot_state != "Suspected") {

-              node.boot_state = node.boot_state == "Alive" ? "Selected" : "Alive";
-              setColor(node);
-              self._notify(node);
+              setState(node, node.boot_state == "Alive" ? "Selected" : "Alive");

               var $nodeInput = self.$nodeInputs[node.arch];
               $nodeInput.val(factorize(self.getNodesId(node.arch)));
               self.update();
               var $nodeInput = self.$nodeInputs[node.arch];
               $nodeInput.val(factorize(self.getNodesId(node.arch)));
               self.update();


@@ -141,13 +128,13 @@ Senslab.Map = function() {
     
     $container.append($canvas);
   }
     
     $container.append($canvas);
   }

-
+  

   Map.prototype.getNodesId = function(arch) {
     var allNodes = this.scene.children;
     var nodes = [];
     for (var i = 0; i < allNodes.length; ++i) {
       if (allNodes[i].arch == arch && allNodes[i].boot_state == "Selected") {
   Map.prototype.getNodesId = function(arch) {
     var allNodes = this.scene.children;
     var nodes = [];
     for (var i = 0; i < allNodes.length; ++i) {
       if (allNodes[i].arch == arch && allNodes[i].boot_state == "Selected") {

-        nodes.push(parseInt(allNodes[i].id));
+        nodes.push(allNodes[i].id);

       }
     }
     return nodes;
       }
     }
     return nodes;


@@ -163,7 +150,7 @@ Senslab.Map = function() {
     for(var i = 0; i < nodes.length; ++i) {
       var material = new THREE.ParticleCanvasMaterial({program: circle});
       var particle = new THREE.Particle(material);
     for(var i = 0; i < nodes.length; ++i) {
       var material = new THREE.ParticleCanvasMaterial({program: circle});
       var particle = new THREE.Particle(material);

-      particle.id = nodes[i].id;
+      particle.id = parseInt(nodes[i].id);

       particle.arch = nodes[i].arch;
       particle.boot_state = nodes[i].boot_state;
       particle.position.x = (nodes[i].x - center.x) * 10;
       particle.arch = nodes[i].arch;
       particle.boot_state = nodes[i].boot_state;
       particle.position.x = (nodes[i].x - center.x) * 10;


@@ -176,21 +163,17 @@ Senslab.Map = function() {
     this.update();
   };
   
     this.update();
   };
   

-  Map.prototype.updateColor = function(arch, selected) {
+  Map.prototype.updateSelected = function(arch, selected) {

     var nodes = this.scene.children;
     for (var i = 0; i < nodes.length; ++i) {
       if (nodes[i].arch == arch && nodes[i].boot_state != "Suspected") {
         var node = nodes[i];
     var nodes = this.scene.children;
     for (var i = 0; i < nodes.length; ++i) {
       if (nodes[i].arch == arch && nodes[i].boot_state != "Suspected") {
         var node = nodes[i];

-        var id = parseInt(node.id);
-        var state = $.inArray(id, selected) == -1 ? "Alive" : "Selected";
+        var state = $.inArray(node.id, selected) == -1 ? "Alive" : "Selected";

         if (node.boot_state != state) {
         if (node.boot_state != state) {

-          node.boot_state = state;
-          this._notify(node);
+          setState(node, state);

         }
         }

-        setColor(node);

       }
     }
       }
     }

-    this.update();

   }
   
   Map.prototype.updatePosition = function() {
   }
   
   Map.prototype.updatePosition = function() {


@@ -205,6 +188,16 @@ Senslab.Map = function() {
     this.renderer.render(this.scene, this.camera);
   };
 
     this.renderer.render(this.scene, this.camera);
   };
 

+  function setState(node, state) {
+    node.boot_state = state;
+    setColor(node);
+    notify(node);
+  }
+
+  function setColor(node) {
+    node.material.color.setHex(colors[node.boot_state] || colors["Selected"]);
+  }
+

   function getCenter(nodes) {
     var xmin = 0, ymin = 0, zmin = 0;
     var xmax = 0, ymax = 0, zmax = 0;
   function getCenter(nodes) {
     var xmin = 0, ymin = 0, zmin = 0;
     var xmax = 0, ymax = 0, zmax = 0;


@@ -280,6 +273,10 @@ Senslab.Map = function() {
     context.closePath();
     context.fill();
   };
     context.closePath();
     context.fill();
   };

+
+  var notify = function(node) {
+    console.log("[Notify] node " + node.id + " is " + node.boot_state);
+  };

   
   return Map;
 }();
\ No newline at end of file
   
   return Map;
 }();
\ No newline at end of file

diff --git a/plugins/senslabmap/static/js/senslabmap.js b/plugins/senslabmap/static/js/senslabmap.js
index 6ba92ee..3b92490 100644 (file)
--- a/plugins/senslabmap/static/js/senslabmap.js
+++ b/plugins/senslabmap/static/js/senslabmap.js
@@ -15,26 +15,22 @@
       this.nodes = {};
     },
     
       this.nodes = {};
     },
     

-    refresh: function() {
-      console.log("refresh");
-    },
-    

     on_show: function(e) {
       e.data.refresh();
     },
     
     on_all_new_record: function(node) {
       Senslab.normalize(node);
     on_show: function(e) {
       e.data.refresh();
     },
     
     on_all_new_record: function(node) {
       Senslab.normalize(node);

-      var site = node.site;
-      if (site) {
+      if (node.normalized) {
+        var site = node.site;

         if ($.inArray(site, this.sites) == -1) {
           this.sites.push(site);
           this.nodes[site] = [];
         }
         this.nodes[site].push(node);
       } else {
         if ($.inArray(site, this.sites) == -1) {
           this.sites.push(site);
           this.nodes[site] = [];
         }
         this.nodes[site].push(node);
       } else {

+        console.warn("node has no site:");

         console.warn(node);
         console.warn(node);

-        console.warn("-> has no site");

       }
     },
     
       }
     },