Changeset 17811

Timestamp:

05/08/14 19:45:40 (11 years ago)

Author:

tbretz

Message:

Minor optimizations.

File:

• trunk/FACT++/www/viewer/index.js (modified) (4 diffs)

trunk/FACT++/www/viewer/index.js

@@ -440 +440 @@
     var data = canv.dataAbs;
     for (var i=0; i<1440; i++)
-        if (data[i]!==undefined && data[i]!==null)
+        if (data[i]!==undefined/* && data[i]!==null*/)
         {
             var ix = parseInt((data[i]-xmin)/step);
@@ -466 +466 @@
     {
         var val = data[map[i]];
-        if (val!==undefined && val!==null)
+        if (!isNaN(val))
             canv.dataAbs[i] = val;
     }
 
-    canv.min = Math.min.apply(Math, canv.dataAbs.filter(function(e){return !isNaN(e)}));
-    canv.max = Math.max.apply(Math, canv.dataAbs.filter(function(e){return !isNaN(e)}));
+    canv.min = Math.min.apply(Math, canv.dataAbs.filter(function(e){return e!==undefined;}));
+    canv.max = Math.max.apply(Math, canv.dataAbs.filter(function(e){return e!==undefined;}));
 
     canv.dataRel = new Array(1440);
     for (var i=0; i<1440; i++)
     {
-        val = data[map[i]];
-        if (val!==undefined && val!==null)
+        var val = canv.dataAbs[i];
+        if (val!==undefined)
             canv.dataRel[i] = (val-canv.min)/canv.max;
     }
@@ -500 +500 @@
     drawHist(n);
 }
-
 
 function onDataReceived(rc)
@@ -1274 +1273 @@
 function drawHex(ctx, x, y, col, min, max)
 {
-    if (col===undefined || col===null || max<min)
+    if (col===undefined/* || col===null*/ || max<min)
         return;