Changeset 17816 for trunk/FACT++

Timestamp:

05/09/14 18:40:02 (11 years ago)

Author:

tbretz

Message:

Switch CodeMirror theme to our own theme; some improvements in the drawing of the cameras; added a grid.

File:

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

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

@@ -187 +187 @@
 
     editor = CodeMirror.fromTextArea(document.getElementById(textarea), config);
-    editor.setOption("theme", "blackboard");
+    editor.setOption("theme", "fact");
 
     return editor;
@@ -1275 +1275 @@
 }
 
-function drawHex(ctx, x, y, col, min, max)
-{
-    if (col===undefined/* || col===null*/ || max<min)
-        return;
+function fillHex(ctx, i, col, min, max)
+{
+    if (col===undefined/* || col===null*/)
+        return false;
 
     var lvl = max==min ? 0.5 : (col-min)/(max-min);
@@ -1285 +1285 @@
 
     ctx.save();
-    ctx.translate(x, y);
+    ctx.translate(coord[i][0], coord[i][1]);
     outlineHex(ctx);
     ctx.fill();
     ctx.restore();
-}
+
+    return true;
+}
+
+function drawHex(ctx, i)
+{
+    ctx.save();
+    ctx.translate(coord[i][0], coord[i][1]);
+    outlineHex(ctx);
+    ctx.stroke();
+    ctx.restore();
+}
+
 
 function Position(s, ring, i)
@@ -1338 +1350 @@
     ctx.translate(-0.5, 0);
 
-    for (var i=0; i<1440; i++)
-        drawHex(ctx, coord[i][0], coord[i][1], data[i], min, max);
+    if (document.getElementById('grid').checked)
+    {
+        ctx.lineWidth = 0.02;
+        ctx.strokeStyle = "#000";
+        for (var i=0; i<1440; i++)
+            drawHex(ctx, i);
+    }
+
+    var hasData = false;
+    if (max>=min)
+        for (var i=0; i<1440; i++)
+            hasData |= fillHex(ctx, i, data[i], min, max);
 
     // =================== Draw Pixel marker ====================
@@ -1346 +1368 @@
     {
         // Draw marker
-        ctx.save();
-
         ctx.lineWidth = 0.25;
-        ctx.fillStyle = "#000";
-
-        ctx.translate(coord[pixel][0], coord[pixel][1]);
-        outlineHex(ctx);
-        ctx.stroke();
-
-        ctx.restore();
+        ctx.strokeStyle = "#000";
+        drawHex(ctx, pixel);
     }
 
@@ -1392 +1407 @@
     ctx.restore();
 
+    if (!hasData)
+        return;
+
     // ======================= Draw Legend ======================
+
+    var v0 = parseFloat(canv.zmin);
+    var v1 = parseFloat(canv.zmax);
+
+    var diff = v1-v0;
+
+    var cw = canv.width;
+    //var ch = canv.height;
+
+    ctx.font         = "8pt Arial";
+    ctx.textAlign    = "right";
+    ctx.textBaseline = "top";
+
+    for (var i=0; i<11; i++)
+    {
+        ctx.strokeStyle = "#"+HLStoRGB(i/10);
+        ctx.strokeText((v0+diff*i/10).toPrecision(3), cw-5, 125-i*12);
+    }
 
     var pval = parseFloat(canv.dataAbs[pixel]).toFixed(1);
@@ -1398 +1434 @@
     var lmax = parseFloat(canv.max).toFixed(1);
 
-    var v0 = parseFloat(canv.zmin);
-    var v1 = parseFloat(canv.zmax);
-
-    var diff = v1-v0;
-
-    var cw = canv.width;
-    //var ch = canv.height;
-
-    ctx.font         = "8pt Arial";
-    ctx.textAlign    = "right";
-    ctx.textBaseline = "top";
-
-    for (var i=0; i<11; i++)
-    {
-        ctx.strokeStyle = "#"+HLStoRGB(i/10);
-        ctx.strokeText((v0+diff*i/10).toPrecision(3), cw-5, 125-i*12);
-    }
+    if (isNaN(pval))
+        pval = "";
 
     var mw = Math.max(ctx.measureText(lmin).width,