Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-27 10:21:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleaned display of TR statistics

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-06-07 20:50:04 +00:00
parent 0dd77f6f27
commit bf00c510c4
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
retroshare-gui/src/gui/TurtleRouterStatistics.cpp
View File

@ -96,11 +96,12 @@ class TRHistogram
} }
} }
int max_bi = std::max(max_hits,max_depth) ;
int p=0 ; int p=0 ;
for(it=depths.begin();it!=depths.end();++it,++p) for(it=depths.begin();it!=depths.end();++it,++p)
for(int i=0;i<MaxDepth;++i) for(int i=0;i<MaxDepth;++i)
painter->fillRect(ox+MaxTime*cellx+20+i*cellx,oy+p*celly,cellx,celly,colorScale(it->second[i]/(float)max_depth)) ; painter->fillRect(ox+MaxTime*cellx+20+i*cellx,oy+p*celly,cellx,celly,colorScale(it->second[i]/(float)max_bi)) ;
painter->setPen(QColor::fromRgb(0,0,0)) ; painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawRect(ox+MaxTime*cellx+20,oy,MaxDepth*cellx,p*celly) ; painter->drawRect(ox+MaxTime*cellx+20,oy,MaxDepth*cellx,p*celly) ;
@ -109,19 +110,22 @@ class TRHistogram
painter->drawText(ox+i*cellx,oy+(p+1)*celly+4,QString::number(i)) ; painter->drawText(ox+i*cellx,oy+(p+1)*celly+4,QString::number(i)) ;
p=0 ; p=0 ;
int great_total = 0 ;
for(it=hits.begin();it!=hits.end();++it,++p) for(it=hits.begin();it!=hits.end();++it,++p)
{ {
int total = 0 ; int total = 0 ;
for(int i=0;i<MaxTime;++i) for(int i=0;i<MaxTime;++i)
{ {
painter->fillRect(ox+i*cellx,oy+p*celly,cellx,celly,colorScale(it->second[i]/(float)max_hits)) ; painter->fillRect(ox+i*cellx,oy+p*celly,cellx,celly,colorScale(it->second[i]/(float)max_bi)) ;
total += it->second[i] ; total += it->second[i] ;
} }
painter->setPen(QColor::fromRgb(0,0,0)) ; painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx,oy+(p+1)*celly,TurtleRouterStatistics::getPeerName(it->first)) ; painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx,oy+(p+1)*celly,TurtleRouterStatistics::getPeerName(it->first)) ;
painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx+120,oy+(p+1)*celly,"("+QString::number(total)+")") ; painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx+120,oy+(p+1)*celly,"("+QString::number(total)+")") ;
great_total += total ;
} }
painter->drawRect(ox,oy,MaxTime*cellx,p*celly) ; painter->drawRect(ox,oy,MaxTime*cellx,p*celly) ;
@ -130,21 +134,37 @@ class TRHistogram
painter->drawText(ox+i*cellx,oy+(p+1)*celly+4,QString::number(i)) ; painter->drawText(ox+i*cellx,oy+(p+1)*celly+4,QString::number(i)) ;
for(int i=0;i<MaxDepth;i++) for(int i=0;i<MaxDepth;i++)
painter->drawText(ox+MaxTime*cellx+20+i*cellx,oy+(p+1)*celly+4,QString::number(i)) ; painter->drawText(ox+MaxTime*cellx+20+i*cellx,oy+(p+1)*celly+4,QString::number(i)) ;
painter->setPen(QColor::fromRgb(255,130,80)) ;
painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx+120,oy+(p+1)*celly+4,"("+QString::number(great_total)+")");
oy += (p+1)*celly+4 ; oy += (p+1)*celly+6 ;
painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawText(ox,oy+celly,QObject::tr("(Age in seconds)")); painter->drawText(ox,oy+celly,QObject::tr("(Age in seconds)"));
painter->drawText(ox+MaxTime*cellx+20,oy+celly,QObject::tr("(Depth)")); painter->drawText(ox+MaxTime*cellx+20,oy+celly,QObject::tr("(Depth)"));
painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx+120,oy+celly,"("+QObject::tr("total")+")");
oy += 3*celly ; oy += 3*celly ;
// now, draw a scale // now, draw a scale
int last_hts = -1 ;
int cellid = 0 ;
for(int i=0;i<=10;++i) for(int i=0;i<=10;++i)
{ {
painter->fillRect(ox+i*(cellx+20),oy,cellx,celly,colorScale(i/10.0f)) ; int hts = (int)(max_bi*i/10.0) ;
painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawRect(ox+i*(cellx+20),oy,cellx,celly) ; if(hts > last_hts)
painter->drawText(ox+i*(cellx+20)+cellx+4,oy+celly,QString::number((int)(max_hits*i/10.0))) ; {
painter->fillRect(ox+cellid*(cellx+22),oy,cellx,celly,colorScale(i/10.0f)) ;
painter->setPen(QColor::fromRgb(0,0,0)) ;
painter->drawRect(ox+cellid*(cellx+22),oy,cellx,celly) ;
painter->drawText(ox+cellid*(cellx+22)+cellx+4,oy+celly,QString::number(hts)) ;
last_hts = hts ;
++cellid ;
}
} }
oy += celly*2 ; oy += celly*2 ;