Browse Source

added exponential notation.

Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
Nicholas Tan Jerome 7 years ago
parent
commit
152046a4e4
2 changed files with 48 additions and 11 deletions
  1. 26 1
      designer.html
  2. 22 10
      status.html

+ 26 - 1
designer.html

@@ -73,6 +73,10 @@
 {% if "larger" in data['style'][key] %}
  data-larger="{{ data['style'][key]['larger'] }}"
 {% else %}
+{% end %}
+{% if "exponential" in data['style'][key] %}
+ data-exponential="{{ data['style'][key]['exponential'] }}"
+{% else %}
 {% end %}
  data-type="{{ data['style'][key]['type'] }}" class='varbox' id="{{ key }}">
 <p><span style="color: #000; font-size: {{ data['style'][key]['header']['size'] }}px; font-weight: {{ data['style'][key]['header']['weight'] }};" class="title">{{ data['style'][key]['header']['title'] }} </span><span style="color: #000; font-size: {{ data['style'][key]['unit']['size'] }}px; font-weight: {{ data['style'][key]['unit']['weight'] }};" class="varval"> XXX.XX <span class='unit_title' style="color: #000; font-size: {{ data['style'][key]['unit']['size'] }}px; font-weight: {{ data['style'][key]['unit']['weight'] }};" > {{ data['style'][key]['unit']['title'] }}</span></span></p>
@@ -166,11 +170,11 @@
 
 <input type="text" id="elem_condition_range" placeholder="condition (red)" style="font-size:16pt; width=100px;"/>
 <input type="text" id="elem_formula" placeholder="Equation" style="font-size:16pt; width=100px;"/>
-
 <select id="elem_unit_style" style="font-size:16pt;">
   <option value="400">normal</option>
   <option value="700">bold</option>
 </select>
+<span class="info">Exp</span><input type="checkbox" id="elem_exponential" style="font-size:16pt; width:20px; height:20px;"/>
 <br /><br />
 <button class="button save" onclick="backup()">Backup</button>
 <button style="display:none;" id="buttonHighlight" class="button highlight" onclick="highlight({{ data['cache'] }})">Highlight</button>
@@ -230,6 +234,12 @@ function add() {
         virtual_id = "0";
     }
     
+    if ($('#elem_exponential').is(":checked")) {
+        data_exponential = true;
+    } else {
+        data_exponential = false;
+    }
+    
     data_lesser = $("#elem_lesser_range").val();
     data_larger = $("#elem_larger_range").val();
     
@@ -275,6 +285,7 @@ function add() {
                     "' data-formula='" + data_formula +
                     "' data-lesser='" + data_lesser + 
  		            "' data-larger='" + data_larger + 
+                    "' data-exponential='" + data_exponential + 
                     "'>" +
                     "<p>" +
                     "<span style='color: " + title_color + ";" + 
@@ -442,6 +453,11 @@ function mysave(data) {
             	    tmp["formula"] = $("#elem_formula").val();
              	    tmp["lesser"] = $("#elem_lesser_range").val();
             	    tmp["larger"] = $("#elem_larger_range").val();
+                    if ($('#elem_exponential').is(":checked")) {
+                        tmp["exponential"] = true;
+                    } else {
+                        tmp["exponential"] = false;
+                    }
             
             	    header = {};
             	    header["title"] = $("#elem_title_text").val().trim();
@@ -469,6 +485,7 @@ function mysave(data) {
             	    tmp["formula"] = $("#"+key).attr("data-formula");
              	    tmp["lesser"] = $("#"+key).attr("data-lesser");
             	    tmp["larger"] = $("#"+key).attr("data-larger");
+                    tmp["exponential"] = $("#"+key).attr("data-exponential");
              	    //tmp["min"] = $("#"+key).attr("min");
            	    //tmp["max"] = $("#"+key).attr("max");
             
@@ -832,6 +849,7 @@ function highlight(mydata) {
     $("#elem_condition_range").val("");
     $("#elem_formula").val("");
     $("#virtual_id_text").val("");
+    $('#elem_exponential').prop('checked', false); 
 
     if (vartype == "header") {
         $("#elem_title_text").val($("#"+varname + " .title").text());
@@ -849,6 +867,13 @@ function highlight(mydata) {
             $("#elem_unit_style").val("700"); 
         }
     } else if (vartype == "data") {
+        
+        if ($("#"+varname).attr("data-exponential")) {
+            $('#elem_exponential').prop('checked', true); 
+        } else {
+            $('#elem_exponential').prop('checked', false); 
+        }
+        
         $("#elem_title_text").val($("#"+varname + " .title").text().trim());
         $("#elem_title_size").val("");
         if ($("#"+varname + " .title").css("font-size")) {

+ 22 - 10
status.html

@@ -70,7 +70,10 @@ data-lesser="{{ data['style'][key]['lesser'] }}"
 data-larger="{{ data['style'][key]['larger'] }}"
 {% else %}
 {% end %}
-     
+{% if "exponential" in data['style'][key] %}
+ data-exponential="{{ data['style'][key]['exponential'] }}"
+{% else %}
+{% end %}
 {% if "ref" in data['style'][key] %}
 data-type="{{ data['style'][key]['type'] }}" onclick="window.open('http://katrin.kit.edu/adei-katrin/#module=graph&{{ data['varname'][data['style'][key]['ref']] }}&experiment=-&window=86400&module=graph&virtual=srctree&srctree=&infomod=legend', '_blank');" id="{{ key }}">
 <p><span style="color: #000; font-size: {{ data['style'][key]['header']['size'] }}px; font-weight: {{ data['style'][key]['header']['weight'] }};" class="title">{{ data['style'][key]['header']['title'] }} </span><span style="color: #000; font-size: {{ data['style'][key]['unit']['size'] }}px; font-weight: {{ data['style'][key]['unit']['weight'] }};" class="varval"> --- </span><span class='unit_title' style="color: #000; font-size: {{ data['style'][key]['unit']['size'] }}px; font-weight: {{ data['style'][key]['unit']['weight'] }};"> {{ data['style'][key]['unit']['title'] }}</span></p>
@@ -158,20 +161,29 @@ function myTimer() {
                         //console.log("data");
                         var datavalue, set_color, formula;
                         var formula_attr = $("#" + key).attr('data-formula');
-			if (response[key]) {
+			            if (response[key]) {
                             if (formula_attr) {
                                 datavalue = parseFloat(response[key]).toFixed(2);
- 			        formula = formula_attr.replace("x", datavalue.toString());
+ 			                    formula = formula_attr.replace("x", datavalue.toString());
                                 datavalue = math.round(math.eval(formula),2);
                                 datavalue = datavalue.toFixed(2);
-		    	    } else {
-			        datavalue = parseFloat(response[key]).toFixed(2);
+		    	            } else {
+                                console.log("XYZVBN CHECK");
+                                console.log($("#" + key).attr('data-exponential'));
+                                if ( ($("#" + key).attr('data-exponential')) == "True" ) {
+			                        //datavalue = math.format(0.000000000001234567, {notation: 'exponential'});
+                                    datavalue = parseFloat(response[key]);
+                                    datavalue = datavalue.toExponential(2)
+                                } else {
+                                    datavalue = parseFloat(response[key]).toFixed(2);
+                                    //datavalue = math.format(0.000000000001234567, {notation: 'exponential'});
+                                }
                             }
- 		    	    set_color = "green";
-		        } else {
-			    datavalue = "---";
-			    set_color = "black";
-		        }
+ 		    	            set_color = "green";
+		                } else {
+			                datavalue = "---";
+			                set_color = "black";
+		                }
                         $(".varval", "#" + key).text(datavalue);
                         var condition_attr = $("#" + key).attr('data-cond');
                         var lesser_attr = $("#" + key).attr('data-lesser');