Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-23 06:14:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added very basic display of outqueue statistics in BwCtrlWindow. Removed unnecessary list::size() calls in pqistreamer

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-31 21:24:42 +00:00
parent ec2d6ed2c7
commit ea5b923428
21 changed files with 345 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp
View file

@ -207,7 +207,12 @@ void BwCtrlWindow::updateDisplay()
return;
}
updateBandwidth();
updateBandwidth();
OutQueueStatistics stats ;
rsConfig->getOutQueueStatistics(stats) ;
_outqueue_stats_W->updateStatistics(stats) ;
}
void BwCtrlWindow::updateBandwidth()

46
retroshare-gui/src/gui/statistics/BwCtrlWindow.ui
View file

@ -13,9 +13,9 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QSplitter" name="splitter">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@ -84,21 +84,27 @@
</property>
</column>
</widget>
<widget class="BWGraph" name="frmGraph" native="true">
<property name="minimumSize">
<size>
<width>120</width>
<height>80</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="OutQueueStatisticsWidget" name="_outqueue_stats_W" native="true"/>
<widget class="BWGraph" name="frmGraph" native="true">
<property name="minimumSize">
<size>
<width>120</width>
<height>80</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
</widget>
</widget>
</widget>
</item>
@ -111,6 +117,12 @@
<header>gui/statistics/bwgraph.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>OutQueueStatisticsWidget</class>
<extends>QWidget</extends>
<header>gui/statistics/OutQueueStatistics.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>

109
retroshare-gui/src/gui/statistics/OutQueueStatistics.cpp Normal file
View file

@ -0,0 +1,109 @@
#include <iostream>
#include <QTimer>
#include <QObject>
#include <QPainter>
#include <QStylePainter>
#include <retroshare/rsconfig.h>
#include "OutQueueStatistics.h"
OutQueueStatisticsWidget::OutQueueStatisticsWidget(QWidget *parent)
: QWidget(parent)
{
maxWidth = 200 ;
maxHeight = 0 ;
}
static QString serviceName(uint16_t s)
{
switch(s)
{
case /* RS_SERVICE_TYPE_FILE_INDEX */ 0x0001: return QString("File index") ;
case /* RS_SERVICE_TYPE_DISC */ 0x0011: return QString("Disc") ;
case /* RS_SERVICE_TYPE_CHAT */ 0x0012: return QString("Chat") ;
case /* RS_SERVICE_TYPE_MSG */ 0x0013: return QString("Msg") ;
case /* RS_SERVICE_TYPE_TURTLE */ 0x0014: return QString("Turtle") ;
case /* RS_SERVICE_TYPE_TUNNEL */ 0x0015: return QString("Tunnel") ;
case /* RS_SERVICE_TYPE_HEARTBEAT */ 0x0016: return QString("Heart Beat") ;
case /* RS_SERVICE_TYPE_FILE_TRANSFER */ 0x0017: return QString("FT") ;
case /* RS_SERVICE_TYPE_GROUTER */ 0x0018: return QString("GRouter") ;
case /* RS_SERVICE_TYPE_SERVICEINFO */ 0x0020: return QString("Service Info") ;
case /* RS_SERVICE_TYPE_BWCTRL */ 0x0021: return QString("BdwCtrl") ;
case /* RS_SERVICE_TYPE_BANLIST */ 0x0101: return QString("BanList") ;
case /* RS_SERVICE_TYPE_STATUS */ 0x0102: return QString("Status") ;
case /* RS_SERVICE_TYPE_NXS */ 0x0200: return QString("Nxs") ;
case /* RS_SERVICE_GXS_TYPE_GXSID */ 0x0211: return QString("Gxs Ids") ;
case /* RS_SERVICE_GXS_TYPE_PHOTO */ 0x0212: return QString("Gxs Photo") ;
case /* RS_SERVICE_GXS_TYPE_WIKI */ 0x0213: return QString("Gxs Wiki") ;
case /* RS_SERVICE_GXS_TYPE_WIRE */ 0x0214: return QString("Gxs Wire") ;
case /* RS_SERVICE_GXS_TYPE_FORUMS */ 0x0215: return QString("Gxs Forums") ;
case /* RS_SERVICE_GXS_TYPE_POSTED */ 0x0216: return QString("Gxs Posted") ;
case /* RS_SERVICE_GXS_TYPE_CHANNELS */ 0x0217: return QString("Gxs Channels") ;
case /* RS_SERVICE_GXS_TYPE_GXSCIRCLE */ 0x0218: return QString("Gxs Circle") ;
case /* RS_SERVICE_GXS_TYPE_REPUTATION */ 0x0219: return QString("Gxs Reput.") ;
case /* RS_SERVICE_TYPE_GXS_RECOGN */ 0x0220: return QString("Gxs Recog.") ;
case /* RS_SERVICE_TYPE_DSDV */ 0x1010: return QString("Dsdv") ;
case /* RS_SERVICE_TYPE_RTT */ 0x1011: return QString("RTT") ;
default: return QString("Unknown") ;
}
}
void OutQueueStatisticsWidget::updateStatistics(OutQueueStatistics& stats)
{
static const int cellx = 6 ;
static const int celly = 10+4 ;
QPixmap tmppixmap(maxWidth, maxHeight);
tmppixmap.fill(this, 0, 0);
setFixedHeight(maxHeight);
QPainter painter(&tmppixmap);
painter.initFrom(this);
maxHeight = 500 ;
// std::cerr << "Drawing into pixmap of size " << maxWidth << "x" << maxHeight << std::endl;
// draw...
int ox=5,oy=5 ;
painter.setPen(QColor::fromRgb(70,70,70)) ;
//painter.drawLine(0,oy,maxWidth,oy) ;
//oy += celly ;
QString by_priority_string,by_service_string ;
for(int i=1;i<stats.per_priority_item_count.size();++i)
by_priority_string += QString::number(stats.per_priority_item_count[i]) + " (" + QString::number(i) + ") " ;
for(std::map<uint16_t,uint32_t>::const_iterator it(stats.per_service_item_count.begin());it!=stats.per_service_item_count.end();++it)
by_service_string += QString::number(it->second) + " (" + serviceName(it->first) + ") " ;
painter.drawText(ox,oy+celly,tr("Outqueue statistics")+":") ; oy += celly*2 ;
painter.drawText(ox+2*cellx,oy+celly,tr("By priority: ") + by_priority_string); oy += celly ;
painter.drawText(ox+2*cellx,oy+celly,tr("By service : ") + by_service_string); oy += celly ;
oy += celly ;
// update the pixmap
//
pixmap = tmppixmap;
maxHeight = oy ;
}
void OutQueueStatisticsWidget::paintEvent(QPaintEvent */*event*/)
{
QStylePainter(this).drawPixmap(0, 0, pixmap);
}
void OutQueueStatisticsWidget::resizeEvent(QResizeEvent *event)
{
QRect TaskGraphRect = geometry();
maxWidth = TaskGraphRect.width();
maxHeight = TaskGraphRect.height() ;
QWidget::resizeEvent(event);
update();
}

22
retroshare-gui/src/gui/statistics/OutQueueStatistics.h Normal file
View file

@ -0,0 +1,22 @@
#pragma once
#include <QWidget>
class OutQueueStatistics ;
class OutQueueStatisticsWidget: public QWidget
{
Q_OBJECT
public:
OutQueueStatisticsWidget(QWidget *parent = NULL) ;
virtual void paintEvent(QPaintEvent *event) ;
virtual void resizeEvent(QResizeEvent *event);
void updateStatistics(OutQueueStatistics&) ;
private:
QPixmap pixmap ;
int maxWidth,maxHeight ;
};