Show mouse coordinates in status box (#134)

ricktu288 · Apr 13, 2024 · d1275a3 · d1275a3
1 parent e912af6
commit d1275a3
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 5 deletions.
diff --git a/simulator/index.html b/simulator/index.html
@@ -1174,7 +1174,10 @@ <h5 class="modal-title" id="staticBackdropLabel" data-text="language"></h5>
         <div class="spinner-border text-secondary" role="status"></div>
         <span data-text="processing"></span>
       </div>
-      <div id="status" style="display: none;"></div>
+      <div id="status" style="display: none;">
+        <div id="mouseCoordinates"></div>
+        <div id="simulatorStatus"></div>
+      </div>
     </div>
 
     <!-- Footer buttons -->

diff --git a/simulator/js/editor.js b/simulator/js/editor.js
@@ -264,6 +264,8 @@ function canvas_onmousemove(e) {
   mousePos = mousePos2;
 
 
+  document.getElementById('mouseCoordinates').innerHTML = getMsg('mouse_coordinates') + "(" + Math.round(mousePos.x) + "," + Math.round(mousePos.y) + ")";
+
   if (isConstructing) {
     // highlight object being constructed
     mouseObj = scene.objs[scene.objs.length - 1];

diff --git a/simulator/js/index.js b/simulator/js/index.js
@@ -107,6 +107,7 @@ window.onload = function (e) {
     if (lastDeviceIsTouch && Date.now() - lastTouchTime < 500) return;
     lastDeviceIsTouch = false;
     mouseObj = -1;
+    document.getElementById('mouseCoordinates').innerHTML = "";
     draw(true, true)
   });
 

diff --git a/simulator/js/simulator.js b/simulator/js/simulator.js
@@ -228,7 +228,7 @@ function shootWaitingRays() {
       timerID = setTimeout(shootWaitingRays, firstBreak ? 100:1);
       firstBreak = false;
       document.getElementById('forceStop').style.display = '';
-      document.getElementById('status').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation.toFixed(3) + '<br>' + getMsg("time_elapsed") + (new Date() - drawBeginTime) + '<br>';
+      document.getElementById('simulatorStatus').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation.toFixed(3) + '<br>' + getMsg("time_elapsed") + (new Date() - drawBeginTime) + '<br>';
 
       draw(true, true); // Redraw the scene.objs to avoid outdated information (e.g. detector readings).
       return;
@@ -619,16 +619,16 @@ function shootWaitingRays() {
 
   if (forceStop)
   {
-    document.getElementById('status').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation.toFixed(3) + '<br>' + getMsg("time_elapsed") + (new Date() - drawBeginTime) + '<br>' + getMsg("force_stopped");
+    document.getElementById('simulatorStatus').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation.toFixed(3) + '<br>' + getMsg("time_elapsed") + (new Date() - drawBeginTime) + '<br>' + getMsg("force_stopped");
     forceStop = false;
   }
   else if (hasExceededTime)
   {
-    //document.getElementById('status').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation;
+    //document.getElementById('simulatorStatus').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation;
   }
   else
   {
-    document.getElementById('status').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation.toFixed(3) + '<br>' + getMsg("time_elapsed") + (new Date() - drawBeginTime);
+    document.getElementById('simulatorStatus').innerHTML = getMsg("ray_count") + shotRayCount + '<br>' + getMsg("total_truncation") + totalTruncation.toFixed(3) + '<br>' + getMsg("time_elapsed") + (new Date() - drawBeginTime);
   }
   document.getElementById('forceStop').style.display = 'none';
   //ctx.stroke();

diff --git a/simulator/locales/de.js b/simulator/locales/de.js
@@ -841,5 +841,9 @@ locales["de"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/en.js b/simulator/locales/en.js
@@ -749,5 +749,8 @@ locales["en"] = {
   },
   "force_stopped": {
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/es.js b/simulator/locales/es.js
@@ -760,5 +760,9 @@ locales["es"] = {
   },
   "force_stopped": {
     "message": "Fuerza detenida."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/fr.js b/simulator/locales/fr.js
@@ -894,5 +894,9 @@ locales["fr"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/ja.js b/simulator/locales/ja.js
@@ -998,5 +998,9 @@ locales["ja"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/ko.js b/simulator/locales/ko.js
@@ -998,5 +998,9 @@ locales["ko"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/nl.js b/simulator/locales/nl.js
@@ -910,5 +910,9 @@ locales["nl"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/pl.js b/simulator/locales/pl.js
@@ -785,5 +785,9 @@ locales["pl"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/ru.js b/simulator/locales/ru.js
@@ -898,5 +898,9 @@ locales["ru"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/si.js b/simulator/locales/si.js
@@ -907,5 +907,9 @@ locales["si"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/template.js b/simulator/locales/template.js
@@ -998,5 +998,9 @@ locales["LOCALE_ID"] = {
   "force_stopped": {
     "incomplete": true,
     "message": "Force stopped."
+  },
+  "mouse_coordinates": {
+    "incomplete": true,
+    "message": "Mouse coordinates: "
   }
 }
diff --git a/simulator/locales/zh_CN.js b/simulator/locales/zh_CN.js
@@ -749,5 +749,8 @@ locales["zh-CN"] = {
   },
   "force_stopped": {
     "message": "已强制终止。"
+  },
+  "mouse_coordinates": {
+    "message": "滑鼠座标："
   }
 }
diff --git a/simulator/locales/zh_TW.js b/simulator/locales/zh_TW.js
@@ -749,5 +749,9 @@ locales["zh-TW"] = {
   },
   "force_stopped": {
     "message": "已強制終止。"
+  },
+  "mouse_coordinates": {
+
+    "message": "滑鼠座標："
   }
 }