From 17b5e95f35120c6f7a2f2a8134502cd675424637 Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 7 Nov 2012 15:25:07 +0000 Subject: [PATCH] *** empty log message *** --- cts/htdocs/thresh/gbe.htm | 12 ------------ cts/htdocs/thresh/scripts.js | 12 ++++++++++++ cts/htdocs/thresh/tdc.htm | 16 ++++++++++------ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/cts/htdocs/thresh/gbe.htm b/cts/htdocs/thresh/gbe.htm index d939c79..059bff9 100644 --- a/cts/htdocs/thresh/gbe.htm +++ b/cts/htdocs/thresh/gbe.htm @@ -32,18 +32,6 @@ var regnames = new Array("Bytes","sent","dropped","small","large","headers","sta var updateRegsTask; -function SciNotation(v) { - if (v == 0) return "0"; - if (v < 1000) return v; - if (v < 20000) return (v/1E3).toFixed(3)+"k" ; - if (v < 1E6) return (v/1E3).toFixed(2)+"k" ; - if (v < 20E6) return (v/1E6).toFixed(3)+"M" ; - if (v < 1E9) return (v/1E6).toFixed(2)+"M" ; - if (v < 20E9) return (v/1E9).toFixed(3)+"G" ; - if (v < 1E12) return (v/1E9).toFixed(2)+"G" ; - return v; - } - function setValues() { updaterate = document.getElementById("form_rate").value; diff --git a/cts/htdocs/thresh/scripts.js b/cts/htdocs/thresh/scripts.js index 930d429..65503b7 100644 --- a/cts/htdocs/thresh/scripts.js +++ b/cts/htdocs/thresh/scripts.js @@ -16,6 +16,18 @@ function getdata(command,callback) { xmlhttp.send(null); } + +function SciNotation(v) { + if (v == 0) return "0"; + if (v < 1000) return v; + if (v < 20000) return (v/1E3).toFixed(3)+"k" ; + if (v < 1E6) return (v/1E3).toFixed(2)+"k" ; + if (v < 20E6) return (v/1E6).toFixed(3)+"M" ; + if (v < 1E9) return (v/1E6).toFixed(2)+"M" ; + if (v < 20E9) return (v/1E9).toFixed(3)+"G" ; + if (v < 1E12) return (v/1E9).toFixed(2)+"G" ; + return v; + } // function reload() { diff --git a/cts/htdocs/thresh/tdc.htm b/cts/htdocs/thresh/tdc.htm index 5d6cc86..9f0a23e 100644 --- a/cts/htdocs/thresh/tdc.htm +++ b/cts/htdocs/thresh/tdc.htm @@ -79,6 +79,8 @@ function update(data) { } oldvalues = c; document.getElementById("content").innerHTML = o; + clearTimeout(updateTask); + updateTask = setTimeout("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate); } function setValues() { @@ -89,10 +91,10 @@ function setValues() { differences= document.getElementById("form_diff").checked; showstatus = document.getElementById("form_status").checked; channels = document.getElementById("form_channels").value; - clearInterval(updateTask); - updateTask = setInterval("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate); - clearInterval(updateRegsTask); - updateRegsTask = setInterval("getdata('getmultreg.pl?"+board+"-"+reglist+"',updateregs)",updaterate2); + clearTimeout(updateTask); + updateTask = setTimeout("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate); + clearTimeout(updateRegsTask); + updateRegsTask = setTimeout("getdata('getmultreg.pl?"+board+"-"+reglist+"',updateregs)",updaterate2); } @@ -132,14 +134,16 @@ function updateregs(data) { } } document.getElementById("contentregs").innerHTML = o; + clearTimeout(updateRegsTask); + updateRegsTask = setTimeout("getdata('getmultreg.pl?"+board+"-"+reglist+"',updateregs)",updaterate2); } getdata("get.pl?"+board+"-c000-"+channels+split,update); getdata("getmultreg.pl?"+board+"-"+reglist,updateregs); -updateTask = setInterval("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate); -updateRegsTask = setInterval("getdata('getmultreg.pl?"+board+"-"+reglist+"',updateregs)",updaterate2); +updateTask = setTimeout("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate); +updateRegsTask = setTimeout("getdata('getmultreg.pl?"+board+"-"+reglist+"',updateregs)",updaterate2); -- 2.43.0