Changeset 17848 for trunk

Timestamp:

05/13/14 12:48:46 (11 years ago)

Author:

tbretz

Message:

Reordered the elements in the display.

File:

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

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

@@ -1393 +1393 @@
             hasData |= fillHex(ctx, i, data[i], min, max);
 
-    // =================== Draw Pixel marker ====================
-
-    if (document.getElementById('marker').checked)
-    {
-        // Draw marker
-        ctx.lineWidth = 0.25;
-        ctx.strokeStyle = "#000";
-        drawHex(ctx, pixel);
-    }
-
     // ======================= Draw Ellipse ======================
 
@@ -1414 +1404 @@
             ctx.scale(1, 2/Math.sqrt(3));
 
+            ctx.beginPath();
+            ctx.moveTo(0.5, 0);
+            ctx.lineTo(h.mean[0], h.mean[1]);
+
+            ctx.strokeStyle = "#CCC";
+            ctx.lineWidth = 0.1;
+            ctx.stroke();
+
             ctx.translate(h.mean[0], h.mean[1]);
             ctx.rotate(h.phi);
+
+            ctx.beginPath();
+            ctx.moveTo(0, -h.disp);
+            ctx.lineTo(0,  h.disp);
+
+            ctx.strokeStyle = "#888";
+            ctx.lineWidth = 0.15;
+            ctx.stroke();
 
             ctx.save();
@@ -1423 +1429 @@
             ctx.restore();
 
+            ctx.strokeStyle = "#555";
             ctx.lineWidth = 0.15;
-            ctx.strokeStyle = "#555";
-            ctx.stroke();
-
-            ctx.strokeStyle = "#888";
-            ctx.beginPath();
-            ctx.moveTo(0, -h.disp);
-            ctx.lineTo(0,  h.disp);
             ctx.stroke();
 
@@ -1436 +1436 @@
         }
     }
+
+    // =================== Draw Pixel marker ====================
+
+    if (document.getElementById('marker').checked)
+    {
+        // Draw marker
+        ctx.lineWidth = 0.25;
+        ctx.strokeStyle = "#000";
+        drawHex(ctx, pixel);
+    }
+
 
     ctx.restore();