From e713f8a285ac58ccd2be2829f9856018d42d9fdb Mon Sep 17 00:00:00 2001
From: kanoi <gitkanoi@k1k2.com>
Date: Tue, 7 Apr 2015 10:20:43 +1000
Subject: [PATCH] php - have an avg line for each worker

---
 pool/page.php        |  5 ++---
 pool/page_usperf.php | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pool/page.php b/pool/page.php
index 4d4c3a69..86a241c0 100644
--- a/pool/page.php
+++ b/pool/page.php
@@ -98,9 +98,8 @@ for(var i=0;i<xn;i++){var x=ar[vx+i];var y=ar[w[j]+vy+i];var xo=(x-x0)/(x1-x0);v
 else{for(var j=1;j<w.length;j++){var f=1;gss(c,cols[j-1]);
 for(var i=0;i<xn;i++){var x=ar[vx+i];var y=ar[w[j]+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,1);
-if(av>0){gss(c,'red');var y=(av-y0)/(y1-y0);
-gbe(c,0,y);gln(c,1,y);gst(c);
-var t=''+av.toFixed(2)+'av';gfz(c,1,y,1,0,t,'red','left')}
+for(var j=1;j<w.length;j++){if(av[j-1]>0){gss(c,'red');var y=(av[j-1]-y0)/(y1-y0);gbe(c,0,y);gln(c,1,y);gst(c);
+var t=''+av[j-1].toFixed(2)+'av';gfz(c,1,y,1,0,t,cols[j-1],'left')}}
 if(c['tkey']){var col,hrl=c['hrs'].length;for(var i=0;i<hrl;i++){if(c['hr']==i){col='red'}else{col='black'}gfz(c,1,0,c['xo']-c['pxe'],hi*(i+1)*2,''+c['hrs'][i],col,'end')}for(var i=0;i<c['hln'].length;i++){if(c['hl']==i){col='red'}else{col='black'}gfz(c,1,0,c['xo']-c['pxe'],hi*(i+2+hrl)*2,''+c['hrs'][i],col,'end')}}
 }
 function sn(i,shi){if(shi.indexOf(' Shift ')<0){return ''+(i%10)}else{return shi.replace(/.* ([a-z])[a-z]*$/,'$1')}}
diff --git a/pool/page_usperf.php b/pool/page_usperf.php
index 325d6305..4bcb2d8b 100644
--- a/pool/page_usperf.php
+++ b/pool/page_usperf.php
@@ -4,16 +4,16 @@ function uspg($nc)
 {
 $g = "function gdrw(c,d,cbx){gc(c);ghrs(c);gopt(c,cbx);
 gfs(c,'white');gss(c,'#0000c0');glw(c,2);gbd(c);
-var rows=d['rows'],ymin=-1,ymax=0,xmin=-1,xmax=0,tda=0,all=d['prefix_all'];
+var rows=d['rows'],ymin=-1,ymax=0,xmin=-1,xmax=0,tda=[];
 var w=d['arp'].split(',');var cols=d['cols'].split(',');
-for(var i=0;i<rows;i++){var s=parseFloat(d['start:'+i]);var e=parseFloat(d['end:'+i]);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;
-for(var j=1;j<w.length;j++){var pre=w[j];var ths=0,nam=pre+'diffacc:'+i;if(d[nam]){var da=parseFloat(d[nam]);var ths=(da/(e-s))*Math.pow(2,32)/Math.pow(10,12);if(pre==all){tda+=da}}d[pre+'ths:'+i]=ths;if(ymin==-1||ymin>ths){ymin=ths}if(ths>ymax)ymax=ths;document.getElementById('worker'+j).value=d[pre+'worker']}
+for(var i=0;i<rows;i++){tda[i]=0;var s=parseFloat(d['start:'+i]);var e=parseFloat(d['end:'+i]);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;
+for(var j=1;j<w.length;j++){var pre=w[j];var ths=0,nam=pre+'diffacc:'+i;if(d[nam]){var da=parseFloat(d[nam]);var ths=(da/(e-s))*Math.pow(2,32)/Math.pow(10,12);tda[i]+=da}d[pre+'ths:'+i]=ths;if(ymin==-1||ymin>ths){ymin=ths}if(ths>ymax)ymax=ths;document.getElementById('worker'+j).value=d[pre+'worker']}
 }
-var tav=(tda/(xmax-xmin))*Math.pow(2,32)/Math.pow(10,12);
+for(var i=0;i<rows;i++){tda[i]*=(Math.pow(2,32)/Math.pow(10,12)/(xmax-xmin))}
 var p5=(ymax-ymin)*0.05;ymax+=p5;ymin-=p5;if(ymin<0){ymin=0}
 if(c['zerob']){ymin=0}
 ghg(c,xmax-xmin);
-ggr(c,0.9,0.9,'TH/s',rows,xmin,xmax,ymin,ymax,d,'nx:','vx:','ths:',tav,w,cols)}
+ggr(c,0.9,0.9,'TH/s',rows,xmin,xmax,ymin,ymax,d,'nx:','vx:','ths:',tda,w,cols)}
 c={};
 function dodrw(data,cbx){if(hasCan()){gdrw(c,sep(data),cbx)}}
 function gact(t){if(t.checked){scnv(t.id,1)}else{scnv(t.id,0)}godrw(0)}