Changeset 17810 for trunk

Timestamp:

05/08/14 17:09:48 (11 years ago)

Author:

tbretz

Message:

Recalculate the image parameters with each redraw to allow to use the lower limit (min) value.

File:

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

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

@@ -470 +470 @@
     }
 
-    canv.hillas = Hillas(canv.dataAbs);
-
     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)}));
@@ -1359 +1357 @@
     // ======================= Draw Ellipse ======================
 
-    var h = canv.hillas;
-    if (h && document.getElementById('image').checked)
-    {
-        ctx.save();
-
-        ctx.translate(h.mean[0], h.mean[1]);
-        ctx.rotate(h.phi);
-
-        ctx.save();
-        ctx.scale(h.axis[0], h.axis[1]);
-        ctx.beginPath();
-        ctx.arc(0, 0, 1, 0, 2*Math.PI);
-        ctx.restore();
-
-        ctx.lineWidth = 0.15;
-        ctx.strokeStyle = "#444";
-        ctx.stroke();
-
-        ctx.strokeStyle = "#888";
-        ctx.beginPath();
-        ctx.moveTo(0, -h.disp);
-        ctx.lineTo(0,  h.disp);
-        ctx.stroke();
-
-        ctx.restore();
+    if (document.getElementById('image').checked)
+    {
+        var h = Hillas(canv.dataAbs, canv.zmin);
+        if (h)
+        {
+            ctx.save();
+
+            ctx.translate(h.mean[0], h.mean[1]);
+            ctx.rotate(h.phi);
+
+            ctx.save();
+            ctx.scale(h.axis[0], h.axis[1]);
+            ctx.beginPath();
+            ctx.arc(0, 0, 1, 0, 2*Math.PI);
+            ctx.restore();
+
+            ctx.lineWidth = 0.15;
+            ctx.strokeStyle = "#555";
+            ctx.stroke();
+
+            ctx.strokeStyle = "#888";
+            ctx.beginPath();
+            ctx.moveTo(0, -h.disp);
+            ctx.lineTo(0,  h.disp);
+            ctx.stroke();
+
+            ctx.restore();
+        }
     }
 
@@ -1426 +1427 @@
 // ===================================================================
 
-function Hillas(data)
+function Hillas(data, min)
 {
     var mx = 0;
@@ -1439 +1440 @@
     for (var i=0; i<1440; i++)
     {
-        if (data[i]===undefined)
+        if (data[i]===undefined || data[i]<min)
             continue;