Browse Source

fixed the overwrite bug in exponential function.

Signed-off-by: root <root@ipekatrinadei.ipe.kit.edu>
root 7 years ago
parent
commit
be9683a27c
2 changed files with 3 additions and 5 deletions
  1. 2 0
      designer.html
  2. 1 5
      status.html

+ 2 - 0
designer.html

@@ -236,8 +236,10 @@ function add() {
     
     if ($('#elem_exponential').is(":checked")) {
         data_exponential = true;
+        $("#"+key).attr("data-exponential", true);
     } else {
         data_exponential = false;
+        $("#"+key).attr("data-exponential", false);
     }
     
     data_lesser = $("#elem_lesser_range").val();

+ 1 - 5
status.html

@@ -168,15 +168,11 @@ function myTimer() {
                                 datavalue = math.round(math.eval(formula),2);
                                 datavalue = datavalue.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'});
+                                if ( ($("#" + key).attr('data-exponential')) == "True" || $("#" + key).attr('data-exponential')) == "true" ) {
                                     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";