Skip to content

router statistics - sort tunnels by traffic (gui) #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RetroPooh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

router statistics - sort tunnels by traffic (gui) #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ void TurtleRouterDialog::processSettings(bool bLoad)
}

bool sr_Compare( TurtleSearchRequestDisplayInfo m1, TurtleSearchRequestDisplayInfo m2) { return m1.age < m2.age; }
bool tun_Compare( std::vector<std::string> m1, std::vector<std::string> m2)
{ return ( strtoul(m1[6].c_str(), NULL, 0) > strtoul(m2[6].c_str(), NULL, 0) ); }

void TurtleRouterDialog::updateDisplay()
{
Expand All @@ -108,7 +110,8 @@ void TurtleRouterDialog::updateDisplay()
rsTurtle->getInfo(hashes_info,tunnels_info,search_reqs_info,tunnel_reqs_info) ;

std::sort(search_reqs_info.begin(),search_reqs_info.end(),sr_Compare) ;

std::sort(tunnels_info.begin(),tunnels_info.end(),tun_Compare) ;

updateTunnelRequests(hashes_info,tunnels_info,search_reqs_info,tunnel_reqs_info) ;

}
Expand Down Expand Up @@ -170,8 +173,20 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
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" + tr("Speed") + ": " + QString::fromStdString(tmp) + "\t " + tr("last transfer") + ": " + QString::fromStdString(tunnels_info[i][4])+ "\t" + QString::fromUtf8(tunnels_info[i][2].c_str()) + " -> " + QString::fromUtf8(tunnels_info[i][1].c_str());

float num2 = strtoull(tunnels_info[i][6].c_str(), NULL, 0);
char tmp2[100] ;
std::string units2[4] = { "B","KB","MB","GB" } ;
int k2=0 ;
while(num2 >= 800.0f && k2<4)
num2 /= 1024.0f,++k2;
sprintf(tmp2,"%3.2f %s",num2,units2[k2].c_str()) ;

QString str = tr("Tunnel id") + ": " + QString::fromUtf8(tunnels_info[i][0].c_str())
+ "\t Traffic: " + QString("%1").arg(QString::fromStdString(tmp2),-10)
+ "\t" + tr("Speed") + ": " + QString("%1").arg(QString::fromStdString(tmp),-10)
+ "\t " + tr("last transfer") + ": " + QString("%1").arg(QString::fromStdString(tunnels_info[i][4]),-11)
+ "\t" + QString::fromUtf8(tunnels_info[i][2].c_str()) + " -> " + QString::fromUtf8(tunnels_info[i][1].c_str());
stl.clear() ;
stl.push_back(str) ;
QTreeWidgetItem *item = new QTreeWidgetItem(stl);
Expand Down