Changeset 17797

Timestamp:

05/07/14 16:33:37 (11 years ago)

Author:

tbretz

Message:

Fixed the calculation of the geometry; added $.conv

File:

• trunk/FACT++/www/viewer/internal.js (modified) (3 diffs)

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

@@ -1452 +1452 @@
         switch (s)
         {
-        case 1: x =  ring   - i/2;  y =       - i; break;
+        case 1: x =  ring   - i/2;  y =        - i; break;
         case 2: x =  ring/2 - i;    y =  -ring    ; break;
         case 3: x = -ring/2 - i/2;  y =  -ring + i; break;
-        case 4: x = -ring   + i/2;  y =       + i; break;
-        case 5: x = -ring/2 + i;    y = ring    ; break;
-        case 0: x =  ring/2 + i/2;  y = ring - i; break;
+        case 4: x = -ring   + i/2;  y =        + i; break;
+        case 5: x = -ring/2 + i;    y =   ring    ; break;
+        case 0: x =  ring/2 + i/2;  y =   ring - i; break;
         }
+
+        var d = x*x + y*y*3/4;
+        if (d - x > 395.75)
+           return;
+
         return [ x, y*s32 ];
     }
@@ -1473 +1478 @@
             {
                 var pos = Position(s, ring, i);
-                var d = Math.sqrt(pos[0]*pos[0]+pos[1]*pos[1]);
-                if (d - pos.x > 395.75)
+                if (pos===undefined)
                     continue;
 
@@ -1495 +1499 @@
     return Math.sqrt(dx*dx + dy*dy);
 }
+
+// Degree per geometry unit
+$.conv = 0.111083657946437597;