Changeset 17838

Timestamp:

05/12/14 14:18:32 (11 years ago)

Author:

tbretz

Message:

No fading for tooltip - hopefully this solves the 'maximum stack exceeded error'; fixed a problem with Disp... width and length need to be scaled in x correctly.

File:

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

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

@@ -426 +426 @@
     if (!item)
     {
-        $("#tooltip").fadeOut(100);
+        $("#tooltip").hide();//fadeOut(100);
         return;
     }
@@ -436 +436 @@
     tooltip.html(parseInt(x) + " / " + y);
     tooltip.css({top: item.pageY-20, left: item.pageX+5});
-    tooltip.fadeIn(200);
+    tooltip.show();//fadeIn(200);
 }
 
@@ -1525 +1525 @@
     var axis1 = yy;
     var axis2 = xx;
-    var ratio = xx/yy;
+
+    // Correction for scale in x
+    var f = Math.sqrt(3)/2; 
+    var ratio = xx/yy/f;
 
     if (d1!=0 || d2==0)
@@ -1539 +1542 @@
         sin = tand/s;
 
-        axis1 = (tand2*yy + d2 + xx)/s2;
-        axis2 = (tand2*xx - d2 + yy)/s2;
-        ratio = (tand2*xx - d2 + yy)/(tand2*yy + d2 + xx);
+        axis1 = (tand2*yy + d2 + xx);
+        axis2 = (tand2*xx - d2 + yy);
+
+        ratio = axis2/axis1;
+
+        axis1 /= s2;
+        axis2 /= s2;
+
+        ratio *= (f + tand*tand)/(tand*tand*f + 1);
     }
 
@@ -1547 +1556 @@
     var width  = axis2<0 ? 0 : Math.sqrt(axis2/sz);
 
+    //var r = (cos*cos*f + sin*sin)/(sin*sin*f + cos*cos);
     return {
         "mean":  [ mx/sz, my/sz ],