]> jspc29.x-matter.uni-frankfurt.de Git - mvd_epics.git/commitdiff
DASH: fix shadowing of var gradient in sparkline.js
authorPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Mon, 18 Sep 2017 16:18:02 +0000 (18:18 +0200)
committerPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Mon, 18 Sep 2017 16:18:02 +0000 (18:18 +0200)
python_suite/dashboard/static/js/sparkline.js

index 56ebee36c79b57f01c98bd279e2d627e70160916..8150bbc856ea556a730179e35d6103bc43e9185b 100644 (file)
@@ -177,9 +177,9 @@ function sparkline() {
 
     function createGradient() {
       var color;
-      var upper_perc_offset = margin.top / (height + margin.top + margin.bottom);
-      var lower_perc_offset = (margin.top + height) / (height + margin.top + margin.bottom);
-      var gradient = (lower_perc_offset - upper_perc_offset) / 100;
+      var upper_perc_offset = margin.top / (height + margin.top + margin.bottom) * 100;
+      var lower_perc_offset = (margin.top + height) / (height + margin.top + margin.bottom) * 100;
+      var m = (lower_perc_offset - upper_perc_offset) / 100;
 
       gradient = svg.append("defs")
         .append("linearGradient")
@@ -192,7 +192,7 @@ function sparkline() {
           .attr("spreadMethod", "pad");
       if (upper_alarm_limit !== null) {
         perc_val = (upper_alarm_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100;
-        perc_val = upper_perc_offset + gradient * perc_val;
+        perc_val = upper_perc_offset + m * perc_val;
         gradient.append("stop")
           .attr("offset",  perc_val + '%')
           .attr("stop-color", gradientColors[2]) // ALARM color
@@ -208,7 +208,7 @@ function sparkline() {
       }
       if (upper_warning_limit !== null) {
         perc_val = (upper_warning_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100;
-        perc_val = upper_perc_offset + gradient * perc_val;
+        perc_val = upper_perc_offset + m * perc_val;
         gradient.append("stop")
           .attr("offset", perc_val + '%')
           .attr("stop-color", gradientColors[1]) // WARNING color
@@ -231,7 +231,7 @@ function sparkline() {
           .attr("stop-opacity", 0.7);
       if (lower_warning_limit !== null) {
         perc_val = (lower_warning_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100;
-        perc_val = upper_perc_offset + gradient * perc_val;
+        perc_val = upper_perc_offset + m * perc_val;
         gradient.append("stop")
           .attr("offset", perc_val + '%')
           .attr("stop-color", gradientColors[0]) // OK color
@@ -243,7 +243,7 @@ function sparkline() {
       }
       if (lower_alarm_limit !== null) {
         perc_val = (lower_alarm_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100;
-        perc_val = upper_perc_offset + gradient * perc_val;
+        perc_val = upper_perc_offset + m * perc_val;
         if (lower_warning_limit !== null)
           color = gradientColors[1]; // WARNING color
         else