added QueueSize to displayed information.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-06-22 01:36:23 +00:00
parent e0af833f47
commit 3dfbf128d8
2 changed files with 22 additions and 6 deletions

View File

@ -138,13 +138,15 @@ void BwCtrlWindow::updateBandwidth()
#define PTW_COL_IN_RATE 2 #define PTW_COL_IN_RATE 2
#define PTW_COL_IN_MAX 3 #define PTW_COL_IN_MAX 3
#define PTW_COL_IN_ALLOC 4 #define PTW_COL_IN_QUEUE 4
#define PTW_COL_IN_ALLOC_SENT 5 #define PTW_COL_IN_ALLOC 5
#define PTW_COL_IN_ALLOC_SENT 6
#define PTW_COL_OUT_RATE 6 #define PTW_COL_OUT_RATE 7
#define PTW_COL_OUT_MAX 7 #define PTW_COL_OUT_MAX 8
#define PTW_COL_OUT_ALLOC 8 #define PTW_COL_OUT_QUEUE 9
#define PTW_COL_OUT_ALLOC_SENT 9 #define PTW_COL_OUT_ALLOC 10
#define PTW_COL_OUT_ALLOC_SENT 11
peerTreeWidget->clear(); peerTreeWidget->clear();
@ -165,11 +167,13 @@ void BwCtrlWindow::updateBandwidth()
item -> setData(PTW_COL_IN_RATE, Qt::DisplayRole, QString::number(totalRates.mRateIn)); item -> setData(PTW_COL_IN_RATE, Qt::DisplayRole, QString::number(totalRates.mRateIn));
item -> setData(PTW_COL_IN_MAX, Qt::DisplayRole, QString::number(totalRates.mRateMaxIn)); item -> setData(PTW_COL_IN_MAX, Qt::DisplayRole, QString::number(totalRates.mRateMaxIn));
item -> setData(PTW_COL_IN_QUEUE, Qt::DisplayRole, QString::number(totalRates.mQueueIn));
item -> setData(PTW_COL_IN_ALLOC, Qt::DisplayRole, QString("N/A")); item -> setData(PTW_COL_IN_ALLOC, Qt::DisplayRole, QString("N/A"));
item -> setData(PTW_COL_IN_ALLOC_SENT, Qt::DisplayRole, QString("N/A")); item -> setData(PTW_COL_IN_ALLOC_SENT, Qt::DisplayRole, QString("N/A"));
item -> setData(PTW_COL_OUT_RATE, Qt::DisplayRole, QString::number(totalRates.mRateOut)); item -> setData(PTW_COL_OUT_RATE, Qt::DisplayRole, QString::number(totalRates.mRateOut));
item -> setData(PTW_COL_OUT_MAX, Qt::DisplayRole, QString::number(totalRates.mRateMaxOut)); item -> setData(PTW_COL_OUT_MAX, Qt::DisplayRole, QString::number(totalRates.mRateMaxOut));
item -> setData(PTW_COL_OUT_QUEUE, Qt::DisplayRole, QString::number(totalRates.mQueueOut));
item -> setData(PTW_COL_OUT_ALLOC, Qt::DisplayRole, QString("N/A")); item -> setData(PTW_COL_OUT_ALLOC, Qt::DisplayRole, QString("N/A"));
item -> setData(PTW_COL_OUT_ALLOC_SENT, Qt::DisplayRole, QString("N/A")); item -> setData(PTW_COL_OUT_ALLOC_SENT, Qt::DisplayRole, QString("N/A"));
@ -206,11 +210,13 @@ void BwCtrlWindow::updateBandwidth()
peer_item -> setData(PTW_COL_IN_RATE, Qt::DisplayRole, QString::number(it->second.mRateIn)); peer_item -> setData(PTW_COL_IN_RATE, Qt::DisplayRole, QString::number(it->second.mRateIn));
peer_item -> setData(PTW_COL_IN_MAX, Qt::DisplayRole, QString::number(it->second.mRateMaxIn)); peer_item -> setData(PTW_COL_IN_MAX, Qt::DisplayRole, QString::number(it->second.mRateMaxIn));
peer_item -> setData(PTW_COL_IN_QUEUE, Qt::DisplayRole, QString::number(it->second.mQueueIn));
peer_item -> setData(PTW_COL_IN_ALLOC, Qt::DisplayRole, QString::number(it->second.mAllocIn)); peer_item -> setData(PTW_COL_IN_ALLOC, Qt::DisplayRole, QString::number(it->second.mAllocIn));
peer_item -> setData(PTW_COL_IN_ALLOC_SENT, Qt::DisplayRole, QString::number(now - it->second.mAllocTs)); peer_item -> setData(PTW_COL_IN_ALLOC_SENT, Qt::DisplayRole, QString::number(now - it->second.mAllocTs));
peer_item -> setData(PTW_COL_OUT_RATE, Qt::DisplayRole, QString::number(it->second.mRateOut)); peer_item -> setData(PTW_COL_OUT_RATE, Qt::DisplayRole, QString::number(it->second.mRateOut));
peer_item -> setData(PTW_COL_OUT_MAX, Qt::DisplayRole, QString::number(it->second.mRateMaxOut)); peer_item -> setData(PTW_COL_OUT_MAX, Qt::DisplayRole, QString::number(it->second.mRateMaxOut));
peer_item -> setData(PTW_COL_OUT_QUEUE, Qt::DisplayRole, QString::number(it->second.mQueueOut));
peer_item -> setData(PTW_COL_OUT_ALLOC, Qt::DisplayRole, QString::number(it->second.mAllowedOut)); peer_item -> setData(PTW_COL_OUT_ALLOC, Qt::DisplayRole, QString::number(it->second.mAllowedOut));
peer_item -> setData(PTW_COL_OUT_ALLOC_SENT, Qt::DisplayRole, QString::number(now - it->second.mAllowedTs)); peer_item -> setData(PTW_COL_OUT_ALLOC_SENT, Qt::DisplayRole, QString::number(now - it->second.mAllowedTs));

View File

@ -54,6 +54,11 @@
<string>InMax (KB/s)</string> <string>InMax (KB/s)</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>InQueue</string>
</property>
</column>
<column> <column>
<property name="text"> <property name="text">
<string>InAllocated (KB/s)</string> <string>InAllocated (KB/s)</string>
@ -74,6 +79,11 @@
<string>OutMax (KB/s)</string> <string>OutMax (KB/s)</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>OutQueue</string>
</property>
</column>
<column> <column>
<property name="text"> <property name="text">
<string>OutAllowed (KB/s)</string> <string>OutAllowed (KB/s)</string>