Changeset 17746 for trunk/FACT++/www/viewer

Timestamp:

04/30/14 20:22:00 (11 years ago)

Author:

tbretz

Message:

Fixed an issue when the slected pixel had no value attached; some performance improvements; reset event number when new file is selected; if the retrurned arrays are not complete, they will be an object not an array - that should work now (however, the returning of incomplete arrays from javascript in v8js is broken so in reality it doesn't work)

File:

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

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

@@ -272 +272 @@
 function onFileSelect(event, ui)
 {
+    document.getElementById("event").value = 0;
     onSubmit(ui.item.value);
 }
@@ -331 +332 @@
     var canv = document.getElementById(id);
 
-    canv.dataAbs = [ ];
+    canv.dataAbs = new Array(1440);
     for (var i=0; i<1440; i++)
         if (data[i]!==undefined && data[i]!==null)
@@ -339 +340 @@
     canv.max = Math.max.apply(Math, canv.dataAbs.filter(function(e){return !isNaN(e)}));
 
-    canv.dataRel = [ ];
+    canv.dataRel = new Array(1440);
     for (var i=0; i<1440; i++)
         if (data[i]!==undefined && data[i]!==null)
@@ -365 +366 @@
     try
     {
-      rc = JSON.parse(rc);
+        rc = JSON.parse(rc);
+        if (!rc)
+            return;
     }
     catch (e)
@@ -430 +433 @@
     if (rc.ret!==undefined && Array.isArray(rc.ret))
     {
-        if (!Array.isArray(rc.ret[0]))
+        if (rc.ret[0] instanceof Object)
+            processCameraData("camera1", rc.ret[0]);
+        else
             processCameraData("camera1", rc.ret);
-        else
-            processCameraData("camera1", rc.ret[0]);
 
         if (rc.ret.length>1)
@@ -462 +465 @@
         waveform.data = [ ];
 
-        var data = [[],[],[],[]];
+        var data = [
+                    new Array(evt.numRoi),
+                    new Array(evt.numRoi),
+                    new Array(evt.numRoi),
+                    new Array(evt.numRoi)
+                    ];
 
         var min = [];
@@ -1110 +1118 @@
 }
 
-var positions = [ ];
+var positions = new Array(1440);
 
 
@@ -1168 +1176 @@
     // ======================= Draw Legend ======================
 
-    var pval = canv.dataAbs[pixel].toFixed(1);
+    var pval = parseFloat(canv.dataAbs[map[pixel]]).toFixed(1);
     var lmin = parseFloat(canv.min).toFixed(1);
     var lmax = parseFloat(canv.max).toFixed(1);