Changeset 17799 for trunk/FACT++/www

Timestamp:

05/07/14 16:39:04 (11 years ago)

Author:

tbretz

Message:

Removed conversion factor. Calculate geometry in degree instead.

File:

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

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

@@ -1446 +1446 @@
 $.geom = (function()
 {
-    var s32 = Math.sqrt(3)/2;
+    var convx = 0.1111;
+    var convy = convx*Math.sqrt(3)/2;
+
     function Position(s, ring, i)
     {
@@ -1464 +1466 @@
            return;
 
-        return [ x, y*s32 ];
+        return [ x*convx, y*convy ];
     }
 
@@ -1486 +1488 @@
     }
 
-    geom[map[1438]] = [ 7, -22*s32 ];
-    geom[map[1439]] = [ 7,  22*s32 ];
+    geom[map[1438]] = [ 7*convx, -22*convy ];
+    geom[map[1439]] = [ 7*convx,  22*convy ];
 
     return geom;
@@ -1499 +1501 @@
     return Math.sqrt(dx*dx + dy*dy);
 }
-
-// Degree per geometry unit
-$.conv = 0.111083657946437597;