Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #740 from RetroPooh/trstats

Browse Source 
router stats - mark active tunnels bold
This commit is contained in:
csoler 2017-03-07 21:58:59 +01:00 committed by GitHub
commit e6cf628fb3
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/turtle/p3turtle.cc
View File

@ -2047,7 +2047,7 @@ void p3turtle::getInfo( std::vector<std::vector<std::string> >& hashes_info,
tunnel.push_back(it->second.hash.toStdString()) ; tunnel.push_back(it->second.hash.toStdString()) ;
tunnel.push_back(printNumber(now-it->second.time_stamp) + " secs ago") ; tunnel.push_back(printNumber(now-it->second.time_stamp) + " secs ago") ;
tunnel.push_back(printFloatNumber(it->second.speed_Bps,true)) ; tunnel.push_back(printFloatNumber(it->second.speed_Bps,false)) ; //
} }
search_reqs_info.clear(); search_reqs_info.clear();

29
retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp
View File

@ -133,12 +133,31 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
if(parent->text(0).left(14) == tr("Unknown hashes")) if(parent->text(0).left(14) == tr("Unknown hashes"))
unknown_hash_found = true ; unknown_hash_found = true ;
float num = strtof(tunnels_info[i][5].c_str(), NULL); // printFloatNumber
char tmp[100] ;
std::string units[4] = { "B/s","KB/s","MB/s","GB/s" } ;
int k=0 ;
while(num >= 800.0f && k<4)
num /= 1024.0f,++k;
sprintf(tmp,"%3.2f %s",num,units[k].c_str()) ;
QString str = tr("Tunnel id") + ": " + QString::fromUtf8(tunnels_info[i][0].c_str()) + "\t [" + QString::fromUtf8(tunnels_info[i][2].c_str()) + "] --> [" + QString::fromUtf8(tunnels_info[i][1].c_str()) + "]\t\t " + tr("last transfer") + ": " + QString::fromStdString(tunnels_info[i][4]) + "\t " + tr("Speed") + ": " + QString::fromStdString(tunnels_info[i][5]) ; QString str = tr("Tunnel id") + ": " + QString::fromUtf8(tunnels_info[i][0].c_str()) + "\t [" + QString::fromUtf8(tunnels_info[i][2].c_str()) + "] --> [" + QString::fromUtf8(tunnels_info[i][1].c_str()) + "]\t\t " + tr("last transfer") + ": " + QString::fromStdString(tunnels_info[i][4]) + " " + "\t " + tr("Speed") + ": " + QString::fromStdString(tmp) ;
stl.clear() ; stl.clear() ;
stl.push_back(str) ; stl.push_back(str) ;
QTreeWidgetItem *item = new QTreeWidgetItem(stl);
parent->addChild(new QTreeWidgetItem(stl)) ; parent->addChild(item);
QFont font = item->font(0);
if(strtol(tunnels_info[i][4].c_str(), NULL, 0)>10) // stuck
{
font.setItalic(true);
item->setFont(0,font);
}
if(strtol(tunnels_info[i][5].c_str(), NULL, 0)>1000) // fast
{
font.setBold(true);
item->setFont(0,font);
}
} }
for(uint i=0;i<search_reqs_info.size();++i) for(uint i=0;i<search_reqs_info.size();++i)
@ -150,7 +169,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
top_level_s_requests->addChild(new QTreeWidgetItem(stl)) ; top_level_s_requests->addChild(new QTreeWidgetItem(stl)) ;
} }
top_level_s_requests->setText(0, tr("Search requests") + "(" + QString::number(search_reqs_info.size()) + ")" ) ; top_level_s_requests->setText(0, tr("Search requests") + " (" + QString::number(search_reqs_info.size()) + ")" ) ;
for(uint i=0;i<tunnel_reqs_info.size();++i) for(uint i=0;i<tunnel_reqs_info.size();++i)
if(i+MAX_TUNNEL_REQUESTS_DISPLAY >= tunnel_reqs_info.size() || i < MAX_TUNNEL_REQUESTS_DISPLAY) if(i+MAX_TUNNEL_REQUESTS_DISPLAY >= tunnel_reqs_info.size() || i < MAX_TUNNEL_REQUESTS_DISPLAY)
@ -170,7 +189,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
} }
top_level_t_requests->setText(0, tr("Tunnel requests") + "("+QString::number(tunnel_reqs_info.size()) + ")") ; top_level_t_requests->setText(0, tr("Tunnel requests") + " ("+QString::number(tunnel_reqs_info.size()) + ")") ;
QTreeWidgetItem *unknown_hashs_item = findParentHashItem(RsFileHash().toStdString()) ; QTreeWidgetItem *unknown_hashs_item = findParentHashItem(RsFileHash().toStdString()) ;
unknown_hashs_item->setText(0,tr("Unknown hashes") + " (" + QString::number(unknown_hashs_item->childCount())+QString(")")) ; unknown_hashs_item->setText(0,tr("Unknown hashes") + " (" + QString::number(unknown_hashs_item->childCount())+QString(")")) ;