Changeset 19370 for trunk/FACT++

Timestamp:

11/10/18 18:40:14 (6 years ago)

Author:

tbretz

Message:

Implemented the FAMOUS camera as an option, be a bit more specific in error messages when calling the index.php fails.

File:

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

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

@@ -2 +2 @@
 
 // ==========================================================================
+
+var camera_type = "FAMOUS";
+
+var scale = camera_type=="FACT" ?   83 : 22;
+var npix  = camera_type=="FACT" ? 1440 : 64;
 
 function onRightMouseClick(event)
@@ -387 +392 @@
 function onFilelistReceived(result)
 {
+    if (result.indexOf("<?php")>=0)
+    {
+        alert("Call to 'index.php' returned its contents.\n"+
+              "It seems the web-server does not support php.\n"+
+              "Accessing data files not possible.");
+        return;
+    }
+
+    if (result=="V8Js missing")
+    {
+        alert("The php module V8Js is missing or not properly installed.\n"+
+              "Check here for details: https://github.com/phpv8/v8js");
+        return;
+    }
     //var dbg = document.getElementById("debug");
 
@@ -570 +589 @@
         return;
     }
+
+    debug(rc.command);
 
     var evt = rc.event;
@@ -1200 +1221 @@
 var map = new Array(1440);
 
-function initPixelMap()
+function initPixelMapFACT()
 {
     var codedMap = "966676:6:A;68656364626Y?\\?;A=A<AGADAN4K4i5g5h5o506W?Z?]?_?>A@A?AJAIAFACAM4J4H4f5d5e5l5m5n516X?[?^?N?P?AA1ABAVAUAKAHAEAO4L4I4G4E4c5a5b5M6j5k5V6Y6\\6_6G?J?O?Q?S?2A4A3AYAXAWAbA_AnAkAhA3404F4D4B4`5^5_5J6K6L6S6T6W6Z6]6E?H?K?M?R?T?V?5A7A6A\\A[AZAeAdAaA^AmAjAgA24o3m3C4A4?4]5[5\\5G6H6I6P6Q6R6U6X6[6^6F?I?L?<?>?U?;@=@8Ah@9AMALA]ABCACfAcA`AoAlAiA4414n3l3<4@4>425Z5X5Y5D6E6F698N6O608E8H8K8H>K>N>?>B>=???A?<@>@@@i@k@j@PAOANAECDCCC<C9CZCWCTC=3:3734313=4;4943515o4W5U5V5A6B6C6687888m7n7C8F8I8F>I>L>=>@>C>E>@?B?D??@A@C@l@n@m@SARAQAHCGCFC?C>C;C8CYCVCSC<393633303n2:4846405n4l4T5R5S5>6?6@6384858j7k7l7o7D8G8J8G>J>M>>>A>D>4>6>C?3?5?B@2@4@o@_@0ALBKBTA0CoBIC8D7D@C=C:C[CXCUC>3;3835323o2m2k27454j3m4k4i4Q5O5P5C7<6=6g71828o8h7i7S9<8?8B8Q>T>W>@=C=F=e<h<5>7>9>4?6?8?3@5@7@`@b@a@OBNBMB3C2C1C;D:D9D_D\\DQCNCKCF3C3@3>2;282Z1W1l2j2h2k3i3g3j4h4f4N5L5M5@7A7B7d7e7f7l8m8n8P9Q9:8=8@8O>R>U>>=A=D=c<f<i<k<8>:><>7?9?;?6@8@:@c@e@d@RBQBPB6C5C4C>D=D<DbDaD^D[DPCMCJCE3B3?3=2:272Y1V1T1i2g2e2h3f3d3g4e4c4K5I5J5=7>7?7a7b7c7i8j8k8M9N9O9R9;8>8A8P>S>V>?=B=E=d<g<j<Z<\\<;>k=m=:?j>l>9@i?k?f@V@g@CBBBSBgBfB7CoCnC?DSDRDcD`D]DRCOCLCG3D3A3?2<292[1X1U1S1Q1f2d2b2e3c3a3d4b4`4H5F5G5:7;7<7^7_7`7f8g8h8J9K9L97:::=:@:C:F:I:I=L=O=7=:===n<1=[<]<_<l=n=0>k>m>o>j?l?n?W@Y@X@FBEBDBjBiBhB2D1D0DVDUDTDCE@EOELEIEXEUERE5222o1l1i1f1c1`1R1P1N1c2a2_2b3`3^3a4_4]4<5:5;5778797[7\\7]7c8d8e8G9H9I94:5:8:;:>:A:D:G:G=J=M=5=8=;=l<o<2=4=^<`<b<o=1>3>n>0?2?m?o?1@Z@\\@[@IBHBGBmBlBkB5D4D3DYDXDWDFEEEBE?ENEKEHEWETEQE4212n1k1h1e1b1_1]1O1M1K1`2^2\\2_3]3[3^4\\4Z4957585475767X7Y7Z7`8a8b8D9E9F91:2:3:6:9:<:?:B:E:H:H=K=N=6=9=<=m<0=3=d;f;a<H<J<2>b=d=1?a>c>0@`?b?]@D@^@:B9BJB^B]BnBfCeC6DJDIDZDnDmDGEDEAEPEMEJEYEVESE623202m1j1g1d1a1^1\\1[0L1J1?1]2[2Y2\\3Z3X3[4Y4W4654555172737U7V7W7]8^8_8A9B9C9e9o90:n9g:j:m:L:O:R:U:X:[:];`;c;T;W;Z;7<9<e;g;i;I<K<M<c=e=g=b>d>f>a?c?e?E@G@F@=B<B;BaB`B_BiChCgCMDLDKD1E0EoD9E7E<F9F6FaE^E[EjEgEdER0O0L0I0F0C0n0l0\\0Z0X0@1>1<1Z2X2V2Y3W3U3X4V4T4E5C5D5n6o607R7S7T7Z8[8\\8>9?9@9b9c9d9l9m9e:h:k:J:M:P:S:V:Y:[;^;a;R;U;X;6<8<:<;<h;j;l;L<N<P<f=h=j=e>g>i>d?f?h?N@Q@H@@B?B>BdBcBbBlCkCjCPDODND4E3E2E;E:E8E6E;F8F5F`E]EZEiEfEcEQ0N0K0H0E0B0m0k0j0Y0W0U0=1;191W2U2S2V3T3R3U4S4Q4B5@5A5k6l6m6O7P7Q7W8X8Y8;9<9=9_9`9a9j9k9\\:_:f:i:l:K:N:Q:T:W:Z:\\;_;b;S;V;Y;C<E<G<<<m;k;1<2<O<Q<S<i=[=P=h>X>Z>g?M@O@R@U@S@J@I@AB1B0BeBTB\\CmCAD@DQDiDhD5EdD<E4F2F0F=F:F7FbE_E\\EkEhEeES0P0M0J0G0D011o0h0g0e0V0T0`0:181Q2T2R2H2S3Q3P3R4P4K3?5=5>5c6i6j6h6M7N7L7U8V8T899:9W9]9^9\\9g9h9i9]:`:c:5;2;o:>;;;8;P;M;J;G;D;A;?<A<D<F<=<><n;o;3<5<R<T<Y=Z=Q=R=Y>[>\\>^>P@T@L@K@5B4B3B2BVBUB^C]CCDBDkDjDfDeD>E=E3F1FnElE@FCFFFIFLFOF;0>0A0205080513101i0f0d0c0b0_0I1H1D1P2O2G2F2D2O3N3M3J3H3a6b6e6f6g6I7J7K7R8S8397989V9Y9Z9[9f9^:a:d:4;1;n:=;:;7;O;L;I;F;C;@;@<B<0<4<U<V<X<`=]=\\=S=U=W=]>_>`>8B7B6BZBXBWB_CaC`CFDEDDDlDgDoEmE>FAFDFGFJFMF90<0?0003060714121a0^0]0G1C1B1N2L2E2C2B2@2L3I3`6d6E7F7G7H7O8Q8192969T9U9X96;3;0;?;<;9;Q;N;K;H;E;B;W<Y<^=_=a=T=V=X=\\B[BYBdCcCbCHDGD?FBFEFHFKFNF:0=0@0104070F1E1A1M2K2J2I2A2D7L8M8N8P809495961b:";
@@ -1214 +1235 @@
     }
     if (sum!=0)
-        alert("Pixel mapping table corrupted!");
-}
-
-initPixelMap();
+        alert("Pixel mapping table corrupted ["+sum+"]!");
+}
+
+function initPixelMapFAMOUS()
+{
+    var codedMap = "C0D0B0J0I0H0E0\\0=0<07080L0K0h0k0^0]0[0Y0@0>0:0403060M0O0N0g0i0l0a0b0_0Z0X0U0V0A0?0;09010002050P0S0R0Q0f0j0m0n0d0e0c0`0W0T0o01101213141516171F0G0";
+    // first: decode the pixel mapping!
+    var sum = 2556;
+    for (var i=0; i<72; i++)
+    {
+        var d0 = codedMap.charCodeAt(i*2)  -48;
+        var d1 = codedMap.charCodeAt(i*2+1)-48;
+
+        map[i] = d0 | (d1<<6);
+        sum -= map[i];
+    }
+    if (sum!=0)
+        alert("Pixel mapping table corrupted ["+sum+"]!");
+}
+
+if (camera_type=="FACT")
+    initPixelMapFACT();
+else
+    initPixelMapFAMOUS();
 
 // ================================== Camera Display ================================================
 
 var coord = new Array(1440);
-function initCameraCoordinates()
+function initCameraCoordinatesFACT()
 {
     coord[0] = [0, 0];
@@ -1245 +1286 @@
 }
 
-initCameraCoordinates();
+function initCameraCoordinatesFAMOUS()
+{
+    var pos;
+
+    coord[0] = [0,0];
+    var cnt = 1;
+    for (var ring=1; ring<5; ring++)
+    {
+        for (var s=0; s<6; s++)
+        {
+            for (var i=1; i<=ring; i++)
+            {
+                pos = new Position(s, ring, i);
+                coord[cnt++] = [ pos.x, -pos.y];
+            }
+        }
+    }
+
+    pos = new Position(3, 6, 2);
+    coord[cnt++] = [pos.x, -pos.y];
+    pos = new Position(4, 6, 4);
+    coord[cnt++] = [pos.x, -pos.y];
+    pos = new Position(0, 6, 2);
+    coord[cnt++] = [pos.x, -pos.y];
+}
+
+if (camera_type=="FACT")
+    initCameraCoordinatesFACT();
+else
+    initCameraCoordinatesFAMOUS();
+
 
 function getIndex(id, mouse)
 {
     var canv = document.getElementById(id);
-
-    var scale = 83;
 
     var w = Math.min(canv.width/scale, canv.height/scale);
@@ -1267 +1336 @@
     mouse.x -= -0.5;
 
-    for (var i=0; i<1440; i++)
+    for (var i=0; i<npix; i++)
         if (isInside(coord[i][0], coord[i][1], mouse))
             return i;
@@ -1390 +1459 @@
     var max = (canv.zmax-canv.min)/canv.max;
 
-    var scale = 83;
-
     var w = Math.min(canv.width/scale, canv.height/scale);
 
@@ -1406 +1473 @@
         ctx.lineWidth = 0.02;
         ctx.strokeStyle = "#000";
-        for (var i=0; i<1440; i++)
+        for (var i=0; i<npix; i++)
             drawHex(ctx, i);
     }
@@ -1412 +1479 @@
     var hasData = false;
     if (max>=min)
-        for (var i=0; i<1440; i++)
+        for (var i=0; i<npix; i++)
             hasData |= fillHex(ctx, i, data[i], min, max);