소스 검색

fixes

* 'invalid login' and 'unknown paddle' buttons now fall in screen
  (using vh/vw units)
* diagnostic pattern extended so as to minimize false triggering
Abram Connelly 6 년 전
부모
커밋
1625cc9704
2개의 변경된 파일34개의 추가작업 그리고 40개의 파일을 삭제
  1. 2 9
      busunit/DIUv2/html/index-ORG.html
  2. 32 31
      busunit/DIUv2/html/js/diu_ui-ORG.js

+ 2 - 9
busunit/DIUv2/html/index-ORG.html

@@ -222,7 +222,7 @@ Diagnostic window...
       <div style='width:100%; height:100%;'>
 
         <div class='pure-g row' style='width:100%; height:100%;' >
-          <div class='pure-u-1-6 col' style=' position:absolute; top:20%; margin-left:25%; '> <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_driverincorrect_btn'>Incorrect Login</button> </div>
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '> <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_driverincorrect_btn'>Incorrect Login</button> </div>
         </div>
 
       </div>
@@ -324,17 +324,10 @@ Diagnostic window...
 
     <div id='ui_paddleunknown' style='display:none;'>
 
-      <!--
-      <br>
-      <div class='pure-g row'>
-        <div class='pure-u-1-6 col'> <button onmousedown='_beep();' class='bdropinp bkeyw' id='ui_paddleunknown_btn'>Unknown Paddle</button> </div>
-      </div>
-      -->
-
       <div style='width:100%; height:100%;'>
 
         <div class='pure-g row' style='width:100%; height:100%;' >
-          <div class='pure-u-1-6 col' style=' position:absolute; top:20%; margin-left:25%; '>
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
             <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_paddleunknown_btn'>Unknown Paddle </button>
           </div>
         </div>

+ 32 - 31
busunit/DIUv2/html/js/diu_ui-ORG.js

@@ -769,6 +769,7 @@ function ui_pattern_mousedown(ev) {
   var height = rect.height;
 
   if (ui_pattern.state == "idle") {
+
     if (y < (height/4)) {
       ui_pattern.state = "square_0";
     }
@@ -798,56 +799,56 @@ function ui_pattern_mousedown(ev) {
 
   else if (ui_pattern.state == "square_2") {
     if (x < (width/4)) {
-      _switch_ui("ui_diagnostic");
+      ui_pattern.state = "square_3";
+    }
+    else {
+      ui_pattern.state = "idle"
     }
-    ui_pattern.state = "idle"
-  }
-
-  return false;
-}
-
-function ui_pattern_mouseup(ev) {
-  return false;
-}
-
-function __ui_pattern_mouseup_depricated(ev) {
-
-  var ele = document.getElementById("body");
-  var rect = ele.getBoundingClientRect();
 
-  var x = ev["x"];
-  var y = ev["y"];
+  }
 
-  var width = rect.width;
-  var height = rect.height;
+  else if (ui_pattern.state == "square_3") {
+    if (y < (height/4)) {
+      ui_pattern.state = "square_4";
+    }
+    else {
+      ui_pattern.state = "idle"
+    }
 
-  if (ui_pattern.state == "cross_0_start") {
+  }
 
-    if ((x > (3*width/4)) && (y > (3*height/4))) {
-      ui_pattern.state = "cross_0_end";
+  else if (ui_pattern.state == "square_4") {
+    if (x > (3*width/4)) {
+      ui_pattern.state = "square_5";
     }
     else {
       ui_pattern.state = "idle"
     }
-
   }
 
-  else if (ui_pattern.state == "cross_1_start") {
+  else if (ui_pattern.state == "square_5") {
+    if (y > (3*height/4)) {
+      ui_pattern.state = "square_6";
+    }
+    else {
+      ui_pattern.state = "idle"
+    }
+  }
 
-    if ((x < (width/4)) && (y > (3*height/4))) {
+  else if (ui_pattern.state == "square_6") {
+    if (x < (width/4)) {
       _switch_ui("ui_diagnostic");
     }
-
-    ui_pattern.state = "idle";
-
-  }
-  else {
-    ui_pattern.state = "idle";
+    ui_pattern.state = "idle"
   }
 
   return false;
 }
 
+function ui_pattern_mouseup(ev) {
+  return false;
+}
+
 //------------
 
 function _mainscreen() {