builder.js : remove normalization menu and add normalization/notation checkbox...

builder.js : remove normalization menu and add normalization/notation checkbox to display menu instead

browser/index.html

@@ -107,14 +107,6 @@
                 </div>
             </div>
 
-            <div id="norm" class="menu" onmouseover="showSelector('ratioSelector');"> normalize 
-                <div id="ratioSelector" class="selector">
-                    <!--TODO generer automatiquement-->
-                    <a class="buttonSelector" onclick="m.normalization_switch(false);">off</a>
-                    <a class="buttonSelector" onclick="m.normalization_switch(true);">on</a> 
-                </div>
-            </div>
-
             <div class="menu" onmouseover="showSelector('groupSelector');"> analysis 
                 <div id="groupSelector" class="selector">
                     <a class="buttonSelector" onclick="sp.changeSplitMethod('gene_v', 'gene_j');">V / J (genes)</a> 
@@ -140,13 +132,24 @@
 
             <div id="display_menu" class="menu" onmouseover="showSelector('displaySelector');"> display
                 <div id="displaySelector" class="selector">
+
                     <div>
                         </br>
                         <input id="top_slider" type="range" min="5" max="100" step="5" value="10" 
                         onchange="m.displayTop(this.value)" />
                     </div>
+
                     <ul>
                     </ul>
+
+                    <div>normalize 
+                        <input id="normalize" type="checkbox" name="normalize" onclick="m.normalization_switch(this.checked);">
+                    </div>
+
+                    <div>scientific notation 
+                        <input id="notation" type="checkbox" name="notation"  onclick="m.notation_switch(this.checked);">
+                    </div>
+
                 </div>
             </div>
 

browser/js/builder.js

@@ -263,7 +263,7 @@ Builder.prototype = {
 
         var displaySelector = document.getElementById("displaySelector")
         var listTag = displaySelector.getElementsByTagName("ul")[0]
-
+        
         //reset
         listTag.innerHTML = "";
 
@@ -307,6 +307,10 @@ Builder.prototype = {
         max_top = (Math.ceil(max_top / 5)) * 5
         document.getElementById("top_slider")
             .max = max_top;
+            
+        if (m.notation_type == "scientific") {
+            document.getElementById("notation").checked = true
+        }
 
         initTag();
     },

browser/js/model.js

@@ -878,6 +878,19 @@ Model.prototype = {
         this.norm = newR;
         this.update();
     },
+    
+    /* use scientific notation ( true/false )
+     *
+     * */
+    notation_switch: function (newR) {
+        console.log("scientific notation : " + newR)
+        if (newR==true) {
+            this.notation_type = "scientific"
+        }else{
+            this.notation_type = "percent"
+        }
+        this.update();
+    },
 
 
     /* change the current tracking point used

browser/js/scatterPlot.js

@@ -293,7 +293,7 @@ ScatterPlot.prototype = {
      *
      * */
     updateBar: function () {
-        var = self = this
+        var self = this
 
         this.vKey = Object.keys(this.m.germline.vgene);
         this.vKey.push("undefined V");