php - graph enhancements

html/can.js

@@ -1,6 +1,6 @@
-function hasCan(){var c=document.getElementById('can');return !!(c.getContext&&c.getContext('2d'));}
+function hasCan(){var c0=document.getElementById('can0');c=document.getElementById('can');return !!(c0&&c&&c.getContext&&c.getContext('2d'));}
 function sep(d){ans={};var ar=d.split("\t");var l=ar.length;for(var i=0;i<l;i++){var e=ar[i].indexOf('=');ans[ar[i].substr(0,e)]=ar[i].substr(e+1)};return ans}
-function gch(z,zm,zo){if(z<0){return 0}if(z>(zm-1)){return(zm-1)}return z}
+function gch(z,zm){if(z<0.5){return 0.5}if(z>(zm-0.5)){return(zm-0.5)}return z}
 function gchx(c,x){return gch(x*c['xm']+c['xo'],c['ctx'].canvas.width)}
 function gchy(c,y){return gch((1-y)*c['ym']+c['yo'],c['ctx'].canvas.height)}
 function gx0(c){return -c['xo']/c['xm']};
@@ -23,32 +23,34 @@ function gfi(c){gle(c);gst(c)}
 function gbd(c){gbe(c,0,0);gln(c,1,0);gln(c,1,1);gln(c,0,1);gle(c);gfl(c);gst(c)}
 function ggr(c,xs,ys,yt,xn,x0,x1,y0,y1,ar,nx,vx,vy,av){
 gtso(c,xs,ys);
-gss(c,'black');glw(c,0.25);
+gss(c,'black');glw(c,0.2);
 gbe(c,0,1);gln(c,0,0);gln(c,1,0);gst(c);
-glwr(c,0.1);
+glw(c,0.01);
 var hi=c['ctx'].measureText('M').width;
 var wi=c['ctx'].measureText('1').width;
 for(var i=0;i<11;i++){var y=i/10.0;gbe(c,-0.01,y);gln(c,1,y);gst(c);var t=''+(((y1-y0)*i/10+y0).toFixed(2));gfz(c,0,y,-wi,0,t,'black','end')}
 gfz(c,gx0(c),0.55,wi,0,yt,'#0080ff','left');
 var m=Math.round(0.5+xn/20.0);
 var f=1;
-for(var i=0;i<xn;i++){var n=ar[nx+i];var x=ar[vx+i];var xo=(x-x0)/(x1-x0);if((i<(xn-1))&&(i%m)==0){gbe(c,xo,0);gln(c,xo,-0.01);gst(c);gfz(c,xo,0,0,-hi*1.5,n,'#00a050','center')}}
+for(var i=0;i<xn;i++){var n=ar[nx+i];var x=ar[vx+i];var xo=(x-x0)/(x1-x0);if((i<(xn-1))&&(i%m)==0){gbe(c,xo,0);gln(c,xo,-0.01);gst(c);gfz(c,xo,0,0,-hi*1.5,n,'#00a050','center')}if(c['ok']==1){gbe(c,xo,0);gln(c,xo,1);gst(c)}}
 glw(c,0.1);
+gss(c,'black');
 for(var i=0;i<xn;i++){var x=ar[vx+i];var y=ar[vy+i];var xo=(x-x0)/(x1-x0);var yo=(y-y0)/(y1-y0);if(f==1){gbe(c,xo,yo);f=0}else{gln(c,xo,yo)}}gst(c);
 glw(c,0.2);
 gss(c,'red');
 var y=(av-y0)/(y1-y0);
 gbe(c,0,y);gln(c,1,y);gst(c);
+var t=''+av.toFixed(2);gfz(c,1,y,1,0,t,'red','left')
 }
 function sn(i,shi){if(shi.indexOf(' Shift ')<0){return ''+(i%10)}else{return shi.replace(/.* ([a-z])[a-z]*$/,'$1')}}
-function gc(c){c['can']=document.getElementById('can');c['ctx']=c['can'].getContext('2d');c['wx']=window.innerWidth;c['wy']=window.innerHeight;c['xm']=c['wx']*0.9;c['ym']=c['wy']*0.8;if(c['ym']>c['xm']){c['ym']=c['xm']}c['xo']=0.0;c['yo']=0.0;c['ctx'].canvas.width=c['xm'];c['ctx'].canvas.height=c['ym']}
+function gc(c,ok){var div=document.getElementById('can0');while(div.firstChild){div.removeChild(div.firstChild)}c['can']=document.createElement('canvas');c['wx']=window.innerWidth;c['wy']=window.innerHeight;c['xm']=Math.round(c['wx']*0.9+0.5);c['ym']=Math.round(c['wy']*0.8+0.5);if(c['ym']>c['xm']){c['ym']=c['xm']}c['xo']=0.0;c['yo']=0.0;c['ctx']=c['can'].getContext('2d');c['ctx'].canvas.width=c['xm']+1;c['ctx'].canvas.height=c['ym']+1;div.appendChild(c['can']);c['ok']=ok}
-function gdrw(d){var c={};gc(c);
+function gdrw(ok,d){var c={};gc(c,ok);
-gfs(c,'white');gss(c,'black');glw(c,1);gbd(c);
+gfs(c,'white');gss(c,'#0000c0');glw(c,0.5);gbd(c);
 var rows=d['rows'];var ymin=-1;var ymax=0;var xmin=-1;var xmax=0;
 var tda=0;
 for(var i=0;i<rows;i++){var s=parseFloat(d['start:'+i]);var e=parseFloat(d['end:'+i]);var da=parseFloat(d['diffacc:'+i]);tda+=da;var ths=(da/(e-s))*Math.pow(2,32)/Math.pow(10,12);d['ths:'+i]=ths;if(ymin==-1||ymin>ths){ymin=ths}if(ths>ymax)ymax=ths;d['nx:'+i]=sn(i,d['shift:'+i]);if(xmin==-1||xmin>s){xmin=s}if(xmax<e){xmax=e}d['vx:'+i]=(s+e)/2.0};
 var tav=(tda/(xmax-xmin))*Math.pow(2,32)/Math.pow(10,12);
 var p5=(ymax-ymin)*0.05;ymax+=p5;ymin-=p5;if(ymin<0){ymin=0}
-ggr(c,0.8,0.9,'THs',rows,xmin,xmax,ymin,ymax,d,'nx:','vx:','ths:',tav);
+ggr(c,0.9,0.9,'THs',rows,xmin,xmax,ymin,ymax,d,'nx:','vx:','ths:',tav);
 }
-function dodrw(d){if(hasCan()){gdrw(sep(d))}}
+function dodrw(ok,d){if(hasCan()){gdrw(ok,sep(d))}}

pool/page_usperf.php

@@ -4,15 +4,21 @@ function dousperf($data, $user)
 {
  $ans = getShiftData($user);
 
+ $iCrap = strpos($_SERVER['HTTP_USER_AGENT'],'iP');
+ if ($iCrap)
+	$ok = 0;
+ else
+	$ok = 1;
+
  $pg = '<h1>User Shift Performance</h1><br>';
  if ($ans['STATUS'] == 'ok' and $ans['DATA'] != '')
  {
-	$pg .= "<canvas id=can width=1 height=1>";
+	$pg .= "<div id=can0><canvas id=can width=1 height=1>";
 	$pg .= "A graph will show here if your browser supports html5/canvas";
-	$pg .= "</canvas>\n";
+	$pg .= "</canvas></div>\n";
 	$data = str_replace(array("\\","'"), array("\\\\","\\'"), $ans['DATA']);
 	$pg .= "<script src='/can.js'></script>\n";
-	$pg .= "<script type='text/javascript'>dodrw('$data');</script>\n";
+	$pg .= "<script type='text/javascript'>dodrw($ok,'$data');</script>\n";
  }
 
  return $pg;