added shortcuts to threshold setting GUI, JM

diff --git a/web/htdocs/scripts/mousetrap.js b/web/htdocs/scripts/mousetrap.js
new file mode 100644 (file)
index 0000000..e3d6d6e
--- /dev/null
+++ b/web/htdocs/scripts/mousetrap.js
@@ -0,0 +1,8 @@
+/* mousetrap v1.3.2 craig.is/killing/mice */
+(function(){function s(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent("on"+b,c)}function y(a){if("keypress"==a.type){var b=String.fromCharCode(a.which);a.shiftKey||(b=b.toLowerCase());return b}return h[a.which]?h[a.which]:z[a.which]?z[a.which]:String.fromCharCode(a.which).toLowerCase()}function t(a,b){a=a||{};var c=!1,d;for(d in m)a[d]&&m[d]>b?c=!0:m[d]=0;c||(p=!1)}function A(a,b,c,d,g){var f,e,h=[],j=c.type;if(!l[a])return[];"keyup"==j&&u(a)&&(b=[a]);for(f=0;f<l[a].length;++f)if(e=
+l[a][f],!(e.seq&&m[e.seq]!=e.level)&&j==e.action&&("keypress"==j&&!c.metaKey&&!c.ctrlKey||b.sort().join(",")===e.modifiers.sort().join(",")))d&&e.combo==g&&l[a].splice(f,1),h.push(e);return h}function v(a,b,c){if(!k.stopCallback(b,b.target||b.srcElement,c)&&!1===a(b,c))b.preventDefault&&b.preventDefault(),b.stopPropagation&&b.stopPropagation(),b.returnValue=!1,b.cancelBubble=!0}function w(a){"number"!==typeof a.which&&(a.which=a.keyCode);var b=y(a);if(b)if("keyup"==a.type&&x==b)x=!1;else{var c=[];
+a.shiftKey&&c.push("shift");a.altKey&&c.push("alt");a.ctrlKey&&c.push("ctrl");a.metaKey&&c.push("meta");var c=A(b,c,a),d,g={},f=0,e=!1;for(d=0;d<c.length;++d)c[d].seq?(e=!0,f=Math.max(f,c[d].level),g[c[d].seq]=1,v(c[d].callback,a,c[d].combo)):!e&&!p&&v(c[d].callback,a,c[d].combo);a.type==p&&!u(b)&&t(g,f)}}function u(a){return"shift"==a||"ctrl"==a||"alt"==a||"meta"==a}function B(a,b,c){if(!c){if(!q){q={};for(var d in h)95<d&&112>d||h.hasOwnProperty(d)&&(q[h[d]]=d)}c=q[a]?"keydown":"keypress"}"keypress"==
+c&&b.length&&(c="keydown");return c}function C(a,b,c,d,g){r[a+":"+c]=b;a=a.replace(/\s+/g," ");var f=a.split(" "),e,h,j=[];if(1<f.length){var k=a,n=c;m[k]=0;n||(n=B(f[0],[]));a=function(){p=n;++m[k];clearTimeout(D);D=setTimeout(t,1E3)};c=function(a){v(b,a,k);"keyup"!==n&&(x=y(a));setTimeout(t,10)};for(d=0;d<f.length;++d)C(f[d],d<f.length-1?a:c,n,k,d)}else{h="+"===a?["+"]:a.split("+");for(f=0;f<h.length;++f)e=h[f],E[e]&&(e=E[e]),c&&("keypress"!=c&&F[e])&&(e=F[e],j.push("shift")),u(e)&&j.push(e);c=
+B(e,j,c);l[e]||(l[e]=[]);A(e,j,{type:c},!d,a);l[e][d?"unshift":"push"]({callback:b,modifiers:j,action:c,seq:d,level:g,combo:a})}}for(var h={8:"backspace",9:"tab",13:"enter",16:"shift",17:"ctrl",18:"alt",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"ins",46:"del",91:"meta",93:"meta",224:"meta"},z={106:"*",107:"+",109:"-",110:".",111:"/",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},
+F={"~":"`","!":"1","@":"2","#":"3",$:"4","%":"5","^":"6","&":"7","*":"8","(":"9",")":"0",_:"-","+":"=",":":";",'"':"'","<":",",">":".","?":"/","|":"\\"},E={option:"alt",command:"meta","return":"enter",escape:"esc"},q,l={},r={},m={},D,x=!1,p=!1,g=1;20>g;++g)h[111+g]="f"+g;for(g=0;9>=g;++g)h[g+96]=g;s(document,"keypress",w);s(document,"keydown",w);s(document,"keyup",w);var k={bind:function(a,b,c){a=a instanceof Array?a:[a];for(var d=0;d<a.length;++d)C(a[d],b,c);return this},unbind:function(a,b){return k.bind(a,
+function(){},b)},trigger:function(a,b){if(r[a+":"+b])r[a+":"+b]({},a);return this},reset:function(){l={};r={};return this},stopCallback:function(a,b){return-1<(" "+b.className+" ").indexOf(" mousetrap ")?!1:"INPUT"==b.tagName||"SELECT"==b.tagName||"TEXTAREA"==b.tagName||b.contentEditable&&"true"==b.contentEditable}};window.Mousetrap=k;"function"===typeof define&&define.amd&&define(k)})();

diff --git a/web/htdocs/thresh/threshold.htm b/web/htdocs/thresh/threshold.htm
index c80ca9119be4d0eca22b58b2e0ea22734beea63f..e1b39a543ff9cfb5b18d92a2828ab59e12f4f574 100644 (file)
--- a/web/htdocs/thresh/threshold.htm
+++ b/web/htdocs/thresh/threshold.htm
@@ -4,6 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
 <script src="../scripts/scripts.js" type="text/javascript"></script>
+<script src="../scripts/mousetrap.js" type="text/javascript"></script>
 <title>Threshold settings</title>
 </head>
 <body>
@@ -25,7 +26,7 @@
 <div>&nbsp;</div>
 </div>
 <td id="bar1value">
-<tr><td>Fine (0-255)<td><div id="bar2"  onScroll="update(2,256)">
+<tr><td>Fine (0-255)<td><div id="bar2" onScroll="update(2,256)">
 <div>&nbsp;</div>
 </div>
 <td id="bar2value">
@@ -34,6 +35,17 @@
 <tr><td id="err" colspan="3">&nbsp;
 </table>
 
+
+
+<h4 title="Awesome!">Shortcuts</h4>
+<ul><li><b>c/C</b>: Increase/Decrease channel number
+    <li><b>d/D</b>: Increase/Decrease chain number
+    <li><b>Up/Down</b>: Increase/Decrease by 1
+    <li><b>Shift + Up/Down</b>: Increase/Decrease by 16
+    <li><b>PageUp/PageDown</b>: Increase/Decrease by 256
+    <li><b>Shift + PageUp/PageDown</b>: Increase/Decrease by 2048
+</ul>
+
 <script language="javascript">
 
 var value = new Array(0,0);
@@ -42,7 +54,7 @@ var updateDelay = 0;
 var command     = 0;
 var updaterate = document.getElementById("form_rate").value;
 var board      = document.getElementById("form_board").value;
-var chain      = 1<<document.getElementById("form_chain").value;
+var chain      = document.getElementById("form_chain").value;
 var chan       = document.getElementById("form_channel").value;
 var type       = document.getElementById("form_type").value;
 var reference  = document.getElementById("form_ref").value;
@@ -66,7 +78,7 @@ function update(bar,scale) {
   
 function doUpdate() {
   if(dataWaiting) {
-    cmdstring = "../commands/put.pl?"+board+"-d400-"+command+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+chain+"-1";
+    cmdstring = "../commands/put.pl?"+board+"-d400-"+command+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+(1<<chain)+"-1";
     getdata(cmdstring,showret);
     dataWaiting = 0;
     }
@@ -90,12 +102,12 @@ function setValues() {
   clearInterval(updateTask);
   updaterate = document.getElementById("form_rate").value;
   board      = document.getElementById("form_board").value;
-  chain      = 1<<document.getElementById("form_chain").value;
+  chain      = document.getElementById("form_chain").value;
   chan       = document.getElementById("form_channel").value;
   type       = document.getElementById("form_type").value;
   reference  = document.getElementById("form_ref").value;
   if(type == 8) {
-    cmdstring = "../commands/spiexec.pl?"+board+"-d400-"+(((chan << 16)).toString(16))+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+chain+"-1";
+    cmdstring = "../commands/spiexec.pl?"+board+"-d400-"+(((chan << 16)).toString(16))+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+(1<<chain)+"-1";
     getdata(cmdstring,anaret2);
     }
   else{  
@@ -103,8 +115,29 @@ function setValues() {
     }
   }
 
-  
-  
+Mousetrap.bind('c', function() { ++chan; chan %= 16; document.getElementById("form_channel").value = chan });  
+Mousetrap.bind('d', function() { ++chain; chain %= 16; document.getElementById("form_chain").value = chain });  
+Mousetrap.bind('C', function() { --chan;  chan%=16;  if (chan<0)  chan=15;  document.getElementById("form_channel").value = chan });  
+Mousetrap.bind('D', function() { --chain; chain%=16; if (chain<0) chain=15; document.getElementById("form_chain").value = chain });  
+ 
+
+function changebar(i) {
+document.getElementById("bar1").scrollLeft+=i; 
+if(document.getElementById("bar1").scrollLeft > 65535) 
+  document.getElementById("bar1").scrollLeft = 65535; 
+if(document.getElementById("bar1").scrollLeft < 0) 
+  document.getElementById("bar1").scrollLeft = 0; 
+update(1,1);
+}
+ 
+Mousetrap.bind('pageup', function(){changebar(256); return false;});  
+Mousetrap.bind('pagedown', function(){changebar(-256); return false;});  
+Mousetrap.bind('shift+pageup', function(){changebar(2048); return false;});  
+Mousetrap.bind('shift+pagedown', function(){changebar(-2048); return false;});  
+Mousetrap.bind('up', function(){changebar(1); return false;});  
+Mousetrap.bind('down', function(){changebar(-1); return false;});  
+Mousetrap.bind('shift+up', function(){changebar(16); return false;});  
+Mousetrap.bind('shift+down', function(){changebar(-16); return false;});  
 </script>
 
 </body></html>