Merge pull request #780 from csoler/v0.6-ImprovedGUI

added mechanism to allow services to document the names of their item…

libretroshare/src/gxs/rsgxsnetservice.cc

@@ -328,6 +328,23 @@ RsGxsNetService::RsGxsNetService(uint16_t servType, RsGeneralDataService *gds,
     mUpdateCounter = 0;
 }
 
+void RsGxsNetService::getItemNames(std::map<uint8_t,std::string>& names) const
+{
+	names.clear();
+
+	names[RS_PKT_SUBTYPE_NXS_SYNC_GRP_REQ_ITEM    ] = "Group Sync Request" ;
+	names[RS_PKT_SUBTYPE_NXS_SYNC_GRP_ITEM        ] = "Group Sync" ;
+	names[RS_PKT_SUBTYPE_NXS_SYNC_GRP_STATS_ITEM  ] = "Group Stats" ;
+	names[RS_PKT_SUBTYPE_NXS_GRP_ITEM             ] = "Group Data" ;
+	names[RS_PKT_SUBTYPE_NXS_ENCRYPTED_DATA_ITEM  ] = "Encrypted data" ;
+	names[RS_PKT_SUBTYPE_NXS_SESSION_KEY_ITEM     ] = "Session Key" ;
+	names[RS_PKT_SUBTYPE_NXS_SYNC_MSG_ITEM        ] = "Message Sync" ;
+	names[RS_PKT_SUBTYPE_NXS_SYNC_MSG_REQ_ITEM    ] = "Message Sync Request" ;
+	names[RS_PKT_SUBTYPE_NXS_MSG_ITEM             ] = "Message Data" ;
+	names[RS_PKT_SUBTYPE_NXS_TRANSAC_ITEM         ] = "Transaction" ;
+	names[RS_PKT_SUBTYPE_NXS_GRP_PUBLISH_KEY_ITEM ] = "Publish key" ;
+}
+
 RsGxsNetService::~RsGxsNetService()
 {
     RS_STACK_MUTEX(mNxsMutex) ;

libretroshare/src/gxs/rsgxsnetservice.h

@@ -99,6 +99,7 @@ public:
 
     virtual RsServiceInfo getServiceInfo() { return mServiceInfo; }
 
+    virtual void getItemNames(std::map<uint8_t,std::string>& names) const ;
 public:
 
 

libretroshare/src/pqi/p3servicecontrol.cc

@@ -29,7 +29,9 @@
 #include "serialiser/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rsbaseserial.h"
+#include "serialiser/rsnxsitems.h"
 #include "pqi/p3cfgmgr.h"
+#include "pqi/pqiservice.h"
 
 /*******************************/
 // #define SERVICECONTROL_DEBUG	1
@@ -138,7 +140,7 @@ public:
             std::cerr << __PRETTY_FUNCTION__ << ": error while deserialising! Item will be dropped." << std::endl;
             return NULL ;
         }
-            
+
         /* add mandatory parts first */
         ok &= getRawUInt32(data, rssize, &offset, &item->mServiceId);
         ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_NAME, item->mServiceName);
@@ -248,6 +250,13 @@ const 	RsPeerId& p3ServiceControl::getOwnId()
 	return mOwnPeerId;
 }
 
+bool p3ServiceControl::getServiceItemNames(uint32_t serviceId,std::map<uint8_t,std::string>& names)
+{
+    if(mServiceServer != NULL)
+        return mServiceServer->getServiceItemNames(serviceId,names) ;
+
+    return false ;
+}
 
 /* Interface for Services */
 bool p3ServiceControl::registerService(const RsServiceInfo &info, bool defaultOn)
@@ -537,7 +546,7 @@ bool p3ServiceControl::updateServicePermissions(uint32_t serviceId, const RsServ
 	{
 		for(pit = onlinePeers.begin(); pit != onlinePeers.end(); ++pit)
 		{
-			if (it->second.peerHasPermission(*pit) != 
+			if (it->second.peerHasPermission(*pit) !=
 				permissions.peerHasPermission(*pit))
 			{
 				mUpdatedSet.insert(*pit);
@@ -597,7 +606,7 @@ bool	p3ServiceControl::checkFilter(uint32_t serviceId, const RsPeerId &peerId)
 #endif
 
 	// must allow ServiceInfo through, or we have nothing!
-#define FULLID_SERVICEINFO ((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + ((RS_SERVICE_TYPE_SERVICEINFO) << 8)) 
+#define FULLID_SERVICEINFO ((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + ((RS_SERVICE_TYPE_SERVICEINFO) << 8))
 
 	//if (serviceId == RS_SERVICE_TYPE_SERVICEINFO)
 	if (serviceId == FULLID_SERVICEINFO)
@@ -691,21 +700,21 @@ bool ServiceInfoCompatible(const RsServiceInfo &info1, const RsServiceInfo &info
 	}
 
 	// ensure that info1 meets minimum requirements for info2
-	if (!versionOkay(info1.mVersionMajor, info1.mVersionMinor, 
+	if (!versionOkay(info1.mVersionMajor, info1.mVersionMinor,
 		info2.mMinVersionMajor, info2.mMinVersionMinor))
 	{
 		return false;
 	}
 
 	// ensure that info2 meets minimum requirements for info1
-	if (!versionOkay(info2.mVersionMajor, info2.mVersionMinor, 
+	if (!versionOkay(info2.mVersionMajor, info2.mVersionMinor,
 		info1.mMinVersionMajor, info1.mMinVersionMinor))
 	{
 		return false;
 	}
 	return true;
 }
-	
+
 
 bool	p3ServiceControl::updateFilterByPeer(const RsPeerId &peerId)
 {
@@ -790,8 +799,8 @@ bool	p3ServiceControl::updateFilterByPeer_locked(const RsPeerId &peerId)
 		std::cerr << "p3ServiceControl::updateFilterByPeer_locked() Empty ... Clearing";
 		std::cerr << std::endl;
 #endif
-	
+
-		// empty, remove... 
+		// empty, remove...
 		recordFilterChanges_locked(peerId, originalFilter, peerFilter);
 		if (fit != mPeerFilterMap.end())
 		{
@@ -882,7 +891,7 @@ bool	p3ServiceControl::updateFilterByPeer_locked(const RsPeerId &peerId)
 		std::cerr << "p3ServiceControl::updateFilterByPeer_locked() Empty(2) ... Clearing";
 		std::cerr << std::endl;
 #endif
-	
+
 		if (fit != mPeerFilterMap.end())
 		{
 			mPeerFilterMap.erase(fit);
@@ -900,7 +909,7 @@ bool	p3ServiceControl::updateFilterByPeer_locked(const RsPeerId &peerId)
 	return true;
 }
 
-void	p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId, 
+void	p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId,
 	ServicePeerFilter &originalFilter, ServicePeerFilter &updatedFilter)
 {
 #ifdef SERVICECONTROL_DEBUG
@@ -1202,7 +1211,7 @@ bool p3ServiceControl::loadList(std::list<RsItem *>& loadList)
 
         if(item != NULL)
 		mServicePermissionMap[item->mServiceId] = *item ;
-        
+
         delete *it ;
     }
 
@@ -1396,49 +1405,49 @@ void	p3ServiceControl::notifyServices()
 				std::cerr << "p3ServiceControl::notifyServices(): Noone Monitoring ... skipping";
 				std::cerr << std::endl;
 #endif
-	
+
 				continue;
 			}
-	
+
 			std::list<pqiServicePeer> peers;
 			std::set<RsPeerId>::const_iterator pit;
-			for(pit = it->second.mAdded.begin(); 
+			for(pit = it->second.mAdded.begin();
 				pit != it->second.mAdded.end(); ++pit)
 			{
 				pqiServicePeer peer;
 				peer.id = *pit;
 				peer.actions = RS_SERVICE_PEER_CONNECTED;
-	
+
 				peers.push_back(peer);
-	
+
 #ifdef SERVICECONTROL_DEBUG
 				std::cerr << "p3ServiceControl::notifyServices(): Peer: " << *pit << " CONNECTED";
 				std::cerr << std::endl;
 #endif
 			}
-	
+
-			for(pit = it->second.mRemoved.begin(); 
+			for(pit = it->second.mRemoved.begin();
 				pit != it->second.mRemoved.end(); ++pit)
 			{
 				pqiServicePeer peer;
 				peer.id = *pit;
 				peer.actions = RS_SERVICE_PEER_DISCONNECTED;
-	
+
 				peers.push_back(peer);
-	
+
 #ifdef SERVICECONTROL_DEBUG
 				std::cerr << "p3ServiceControl::notifyServices(): Peer: " << *pit << " DISCONNECTED";
 				std::cerr << std::endl;
 #endif
 			}
-	
+
 			for(; sit != eit; ++sit)
 			{
 #ifdef SERVICECONTROL_DEBUG
 				std::cerr << "p3ServiceControl::notifyServices(): Sending to Monitoring Service";
 				std::cerr << std::endl;
 #endif
-	
+
 				sit->second->statusChange(peers);
 			}
 		}
@@ -1500,17 +1509,17 @@ void RsServicePermissions::resetPermission(const RsPeerId& peerId)
 }
 
 RsServiceInfo::RsServiceInfo(
-		const uint16_t service_type, 
+		const uint16_t service_type,
-		const std::string service_name, 
+		const std::string service_name,
 		const uint16_t version_major,
 		const uint16_t version_minor,
 		const uint16_t min_version_major,
 		const uint16_t min_version_minor)
- :mServiceName(service_name), 
+ :mServiceName(service_name),
-  mServiceType((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) service_type) << 8)), 
+  mServiceType((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) service_type) << 8)),
-  mVersionMajor(version_major), 
+  mVersionMajor(version_major),
   mVersionMinor(version_minor),
-  mMinVersionMajor(min_version_major), 
+  mMinVersionMajor(min_version_major),
   mMinVersionMinor(min_version_minor)
 {
 	return;
@@ -1518,7 +1527,7 @@ RsServiceInfo::RsServiceInfo(
 
 
 RsServiceInfo::RsServiceInfo()
- :mServiceName("unknown"), 
+ :mServiceName("unknown"),
   mServiceType(0),
   mVersionMajor(0),
   mVersionMinor(0),

libretroshare/src/pqi/p3servicecontrol.h

@@ -36,6 +36,8 @@
 #include "pqi/pqiservicemonitor.h"
 #include "pqi/p3linkmgr.h"
 
+class p3ServiceServer ;
+
 class ServiceNotifications
 {
 	public:
@@ -101,6 +103,9 @@ virtual bool updateServicePermissions(uint32_t serviceId, const RsServicePermiss
 virtual void getPeersConnected(const uint32_t serviceId, std::set<RsPeerId> &peerSet);
 virtual bool isPeerConnected(const uint32_t serviceId, const RsPeerId &peerId);
 
+    // Gets the list of items used by that service
+virtual bool getServiceItemNames(uint32_t serviceId,std::map<uint8_t,std::string>& names) ;
+
 	/**
 	 * Registration for all Services.
 	 */
@@ -132,6 +137,8 @@ virtual bool updateServicesProvided(const RsPeerId &peerId, const RsPeerServiceI
 	// pqiMonitor.
 virtual void    statusChange(const std::list<pqipeer> &plist);
 
+        virtual void setServiceServer(p3ServiceServer *p) { mServiceServer = p ; }
+
 protected:
 	// configuration.
 virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
@@ -196,6 +203,7 @@ bool peerHasPermissionForService_locked(const RsPeerId &peerId, uint32_t service
     // Below here is saved in Configuration.
     std::map<uint32_t, RsServicePermissions> mServicePermissionMap;
 
+    p3ServiceServer *mServiceServer ;
 };
 
 

libretroshare/src/pqi/pqiservice.cc

@@ -79,11 +79,26 @@ int	p3ServiceServer::addService(pqiService *ts, bool defaultOn)
 	services[info.mServiceType] = ts;
 
 	// This doesn't need to be in Mutex.
-	mServiceControl->registerService(info, defaultOn);
+	mServiceControl->registerService(info,defaultOn);
 
 	return 1;
 }
 
+bool p3ServiceServer::getServiceItemNames(uint32_t service_type,std::map<uint8_t,std::string>& names)
+{
+	RsStackMutex stack(srvMtx); /********* LOCKED *********/
+
+ 	std::map<uint32_t, pqiService *>::iterator it=services.find(service_type) ;
+
+	if(it != services.end())
+    {
+	   it->second->getItemNames(names) ;
+       return true ;
+    }
+    else
+        return false ;
+}
+
 int p3ServiceServer::removeService(pqiService *ts)
 {
 	RsStackMutex stack(srvMtx); /********* LOCKED *********/

libretroshare/src/pqi/pqiservice.h

@@ -60,24 +60,26 @@ class p3ServiceServerIface;
 
 class pqiService
 {
-	protected:
+protected:
 
 	pqiService() // our type of packets.
-	:mServiceServer(NULL) { return; }
+	    :mServiceServer(NULL) { return; }
 
-virtual ~pqiService() { return; }
+	virtual ~pqiService() { return; }
 
-	public:
+public:
-void 	setServiceServer(p3ServiceServerIface *server);
+	void 	setServiceServer(p3ServiceServerIface *server);
-	// 
+	//
-virtual bool	recv(RsRawItem *) = 0;
+	virtual bool	recv(RsRawItem *) = 0;
-virtual bool	send(RsRawItem *item);
+	virtual bool	send(RsRawItem *item);
 
-virtual RsServiceInfo getServiceInfo() = 0;
+	virtual RsServiceInfo getServiceInfo() = 0;
 
-virtual int	tick() { return 0; }
+	virtual int	tick() { return 0; }
 
-	private:
+    virtual void getItemNames(std::map<uint8_t,std::string>& names) const {}	// This does nothing by default. Service should derive it in order to give info for the UI
+
+private:
 	p3ServiceServerIface *mServiceServer; // const, no need for mutex.
 };
 
@@ -97,10 +99,10 @@ public:
 	virtual ~p3ServiceServerIface() {}
 
 
-virtual bool	recvItem(RsRawItem *) = 0;
+	virtual bool	recvItem(RsRawItem *) = 0;
-virtual bool	sendItem(RsRawItem *) = 0;
+	virtual bool	sendItem(RsRawItem *) = 0;
-
 
+	virtual bool    getServiceItemNames(uint32_t service_type,std::map<uint8_t,std::string>& names) =0;
 };
 
 class p3ServiceServer : public p3ServiceServerIface
@@ -108,13 +110,15 @@ class p3ServiceServer : public p3ServiceServerIface
 public:
 	p3ServiceServer(pqiPublisher *pub, p3ServiceControl *ctrl);
 
-int	addService(pqiService *, bool defaultOn);
+	int	addService(pqiService *, bool defaultOn);
-int	removeService(pqiService *);
+	int	removeService(pqiService *);
 
-bool	recvItem(RsRawItem *);
+	bool	recvItem(RsRawItem *);
-bool	sendItem(RsRawItem *);
+	bool	sendItem(RsRawItem *);
 
-int	tick();
+	bool getServiceItemNames(uint32_t service_type, std::map<uint8_t,std::string>& names) ;
+
+	int	tick();
 public:
 
 private:
@@ -122,7 +126,7 @@ private:
 	pqiPublisher *mPublisher;	// constant no need for mutex.
 	p3ServiceControl *mServiceControl;
 
-	RsMutex srvMtx; 
+	RsMutex srvMtx;
 	std::map<uint32_t, pqiService *> services;
 
 };

libretroshare/src/retroshare/rsservicecontrol.h

@@ -109,6 +109,7 @@ virtual ~RsServiceControl() { return; }
 
 virtual bool getOwnServices(RsPeerServiceInfo &info) = 0;
 virtual std::string getServiceName(uint32_t service_id) = 0;
+virtual bool getServiceItemNames(uint32_t service_id,std::map<uint8_t,std::string>& names) = 0;
 
 virtual bool getServicesAllowed(const RsPeerId &peerId, RsPeerServiceInfo &info) = 0;
 virtual bool getServicesProvided(const RsPeerId &peerId, RsPeerServiceInfo &info) = 0;

libretroshare/src/rsserver/rsinit.cc

@@ -1243,6 +1243,8 @@ int RsServer::StartupRetroShare()
     pqih = new pqisslpersongrp(serviceCtrl, flags, mPeerMgr);
 	//pqih = new pqipersongrpDummy(none, flags);
 
+    serviceCtrl->setServiceServer(pqih) ;
+
 	/****** New Ft Server **** !!! */
     ftServer *ftserver = new ftServer(mPeerMgr, serviceCtrl);
     ftserver->setConfigDirectory(rsAccounts->PathAccountDirectory());

retroshare-gui/src/gui/common/RSGraphWidget.cpp

@@ -99,6 +99,11 @@ QString RSGraphSource::displayValue(float v) const
     return QString::number(v,'f',_digits) + " " + unitName() ;
 }
 
+void RSGraphSource::getCumulatedValues(std::vector<float>& vals) const
+{
+    for(std::map<std::string,float>::const_iterator it = _totals.begin();it!=_totals.end();++it)
+        vals.push_back(it->second) ;
+}
 void RSGraphSource::getCurrentValues(std::vector<QPointF>& vals) const
 {
     std::map<std::string,std::list<std::pair<qint64,float> > >::const_iterator it = _points.begin();
@@ -108,9 +113,9 @@ void RSGraphSource::getCurrentValues(std::vector<QPointF>& vals) const
         vals.push_back(QPointF( (now - it->second.back().first)/1000.0f,it->second.back().second)) ;
 }
 
-QString RSGraphSource::legend(int i,float v) const
+QString RSGraphSource::legend(int i,float v,bool show_value) const
 {
-    return displayName(i) + " (" + displayValue(v) + " )";
+    return displayName(i) + (show_value?(" (" + displayValue(v) + ")"):"");
 }
 
 void RSGraphSource::getDataPoints(int index,std::vector<QPointF>& pts,float filter_factor) const
@@ -209,11 +214,30 @@ void RSGraphSource::update()
     }
         else
             ++it ;
+
+    updateTotals();
+}
+
+void RSGraphSource::updateTotals()
+{
+    // now compute totals
+
+    _totals.clear();
+
+    for(std::map<std::string,std::list<std::pair<qint64,float> > >::const_iterator it(_points.begin());it!=_points.end();++it)
+    {
+        float& f = _totals[it->first] ;
+
+        f = 0.0f ;
+        for(std::list<std::pair<qint64,float> >::const_iterator it2=it->second.begin();it2!=it->second.end();++it2)
+			f += (*it2).second ;
+    }
 }
 
 void RSGraphSource::reset()
 {
-    _points.clear() ;
+    _points.clear();
+    _totals.clear();
 }
 
 void RSGraphSource::setCollectionTimeLimit(qint64 s) { _time_limit_msecs = s ; }
@@ -630,8 +654,19 @@ void RSGraphWidget::paintLegend()
 {
   //int bottom = _rec.height();
 
-  std::vector<QPointF> vals ;
+  std::vector<float> vals ;
-  _source->getCurrentValues(vals) ;
+
+  if(_flags & RSGRAPH_FLAGS_LEGEND_CUMULATED)
+	  _source->getCumulatedValues(vals) ;
+  else
+  {
+	  std::vector<QPointF> cvals ;
+	  _source->getCurrentValues(cvals) ;
+
+      for(uint32_t i=0;i<cvals.size();++i)
+          vals.push_back(cvals[i].y()) ;
+  }
+
   int j=0;
 
     float FS = QFontMetricsF(font()).height();
@@ -640,12 +675,13 @@ void RSGraphWidget::paintLegend()
     for(uint i=0;i<vals.size();++i)
       if( _masked_entries.find(_source->displayName(i).toStdString()) == _masked_entries.end() )
       {
-          if( _rec.width() - (vals[i].x()-0)*_time_scale < SCALE_WIDTH*fact )
+//          if( _rec.width() - (vals[i].x()-0)*_time_scale < SCALE_WIDTH*fact )
-              continue ;
+//              continue ;
 
           qreal paintStep = 4*fact+FS;
           qreal pos = 15*fact+j*paintStep;
-          QString text = _source->legend(i,vals[i].y()) ;
+
+          QString text = _source->legend(i,vals[i]) ;
 
           QPen oldPen = _painter->pen();
           _painter->setPen(QPen(getColor(i), Qt::SolidLine));

retroshare-gui/src/gui/common/RSGraphWidget.h

@@ -69,8 +69,11 @@ public:
     // return the vector of last values up to date
     virtual void getCurrentValues(std::vector<QPointF>& vals) const ;
 
+    // return the vector of cumulated values up to date
+	virtual void getCumulatedValues(std::vector<float>& vals) const;
+
     // returns what to display in the legend. Derive this to show additional info.
-    virtual QString legend(int i,float v) const ;
+    virtual QString legend(int i, float v, bool show_value=true) const ;
 
     // Returns the n^th interpolated value at the given time in floating point seconds backward.
     virtual void getDataPoints(int index, std::vector<QPointF>& pts, float filter_factor=0.0f) const ;
@@ -95,11 +98,13 @@ protected slots:
 protected:
     virtual void getValues(std::map<std::string,float>& values) const = 0 ;// overload this in your own class to fill in the values you want to display.
 
+	void updateTotals();
     qint64 getTime() const ;						   // returns time in ms since RS has started
 
     // Storage of collected events. The string is any string used to represent the collected data.
 
     std::map<std::string, std::list<std::pair<qint64,float> > > _points ;
+    std::map<std::string, float> _totals ;
 
     QTimer *_timer ;
 
@@ -118,8 +123,9 @@ public:
 	static const uint32_t RSGRAPH_FLAGS_LOG_SCALE_Y     	= 0x0002 ;// log scale in Y
 	static const uint32_t RSGRAPH_FLAGS_ALWAYS_COLLECT  	= 0x0004 ;// keep collecting while not displayed
 	static const uint32_t RSGRAPH_FLAGS_PAINT_STYLE_PLAIN	= 0x0008 ;// use plain / line drawing style
-	static const uint32_t RSGRAPH_FLAGS_SHOW_LEGEND       = 0x0010 ;// show legend in the graph
+	static const uint32_t RSGRAPH_FLAGS_SHOW_LEGEND         = 0x0010 ;// show legend in the graph
-	static const uint32_t RSGRAPH_FLAGS_PAINT_STYLE_FLAT  = 0x0020 ;// do not interpolate, and draw flat colored boxes
+	static const uint32_t RSGRAPH_FLAGS_PAINT_STYLE_FLAT    = 0x0020 ;// do not interpolate, and draw flat colored boxes
+	static const uint32_t RSGRAPH_FLAGS_LEGEND_CUMULATED    = 0x0040 ;// show the total in the legend rather than current values
 
 	/** Bandwidth graph style. */
 	enum GraphStyle 

retroshare-gui/src/gui/statistics/BWGraph.cpp

@@ -107,16 +107,25 @@ void BWGraphSource::update()
 
     // remove empty lists
 
+    float duration = 0.0f;
+
     for(std::map<std::string,std::list<std::pair<qint64,float> > >::iterator it=_points.begin();it!=_points.end();)
         if(it->second.empty())
-    {
+		{
-        std::map<std::string,std::list<std::pair<qint64,float> > >::iterator tmp(it) ;
+			std::map<std::string,std::list<std::pair<qint64,float> > >::iterator tmp(it) ;
-        ++tmp;
+			++tmp;
-        _points.erase(it) ;
+			_points.erase(it) ;
-        it=tmp ;
+			it=tmp ;
-    }
+		}
         else
+        {
+            float d = it->second.back().first - it->second.front().first;
+
+            if(duration < d)
+                duration = d ;
+
             ++it ;
+        }
 
     // also clears history
 
@@ -138,11 +147,36 @@ void BWGraphSource::update()
                 break ;
     }
 
+    // now update the totals, and possibly convert into an average if the unit requires it.
+
+    updateTotals();
+
+    if(_current_unit == UNIT_KILOBYTES)
+        for(std::map<std::string,float>::iterator it(_totals.begin());it!=_totals.end();++it)
+            it->second /= (duration/1000.0) ;
+
 #ifdef BWGRAPH_DEBUG
     std::cerr << "Traffic history has size " << mTrafficHistory.size() << std::endl;
 #endif
 }
 
+std::string BWGraphSource::makeSubItemName(uint16_t service_id,uint8_t sub_item_type) const
+{
+    RsServiceInfoWithNames& s(mServiceInfoMap[service_id]) ;
+
+    if(s.item_names.empty())
+		return "item #"+QString("%1").arg(sub_item_type,2,16,QChar('0')).toStdString() ;
+    else
+    {
+        std::map<uint8_t,std::string>::const_iterator it = s.item_names.find(sub_item_type) ;
+
+        if(it == s.item_names.end())
+            return "item #"+QString("%1").arg(sub_item_type,2,16,QChar('0')).toStdString() + " (undocumented)";
+
+        return QString("%1").arg(sub_item_type,2,16,QChar('0')).toStdString()+": " + it->second ;
+    }
+}
+
 void BWGraphSource::convertTrafficClueToValues(const std::list<RSTrafficClue>& lst,std::map<std::string,float>& vals) const
 {
 	vals.clear() ;
@@ -162,7 +196,7 @@ void BWGraphSource::convertTrafficClueToValues(const std::list<RSTrafficClue>& l
 
 			for(uint32_t i=0;i<256;++i)
 				if(clue_per_sub_id[i].count > 0)
-					vals["item #"+QString::number(i,16).toStdString()] = (_current_unit == UNIT_KILOBYTES)?(clue_per_sub_id[i].size):(clue_per_sub_id[i].count) ;
+					vals[makeSubItemName(clue_per_sub_id[i].service_id,i)] = (_current_unit == UNIT_KILOBYTES)?(clue_per_sub_id[i].size):(clue_per_sub_id[i].count) ;
 		}
 			break ;
 
@@ -233,11 +267,14 @@ void BWGraphSource::convertTrafficClueToValues(const std::list<RSTrafficClue>& l
 
 			for(std::list<RSTrafficClue>::const_iterator  it(lst.begin());it!=lst.end();++it)
 				if(it->service_id == _current_selected_service)
+                {
 					clue_per_sub_id[it->service_sub_id] += *it ;
+					clue_per_sub_id[it->service_sub_id].service_id = it->service_id ;
+                }
 
 			for(uint32_t i=0;i<256;++i)
 				if(clue_per_sub_id[i].count > 0)
-					vals["item #"+QString::number(i,16).toStdString()] = (_current_unit == UNIT_KILOBYTES)?(clue_per_sub_id[i].size):(clue_per_sub_id[i].count) ;
+					vals[makeSubItemName(clue_per_sub_id[i].service_id,i)] = (_current_unit == UNIT_KILOBYTES)?(clue_per_sub_id[i].size):(clue_per_sub_id[i].count) ;
 		}
 			break ;
 
@@ -297,7 +334,11 @@ BWGraphSource::BWGraphSource()
     rsServiceControl->getOwnServices(rspsi) ;
 
     for(std::map<uint32_t,RsServiceInfo>::const_iterator it(rspsi.mServiceList.begin());it!=rspsi.mServiceList.end();++it)
+    {
         mServiceInfoMap[ (it->first >> 8) & 0xffff ] = it->second ;
+
+        rsServiceControl->getServiceItemNames(it->first,mServiceInfoMap[(it->first >> 8) & 0xffff].item_names) ;
+    }
 }
 
 void BWGraphSource::getValues(std::map<std::string,float>& values) const
@@ -359,9 +400,9 @@ QString BWGraphSource::displayValue(float v) const
     return QString() ;
 }
 
-QString BWGraphSource::legend(int i,float v) const
+QString BWGraphSource::legend(int i,float v,bool show_value) const
 {
-        return RSGraphSource::legend(i,v) ;//+ " Total: " + niceNumber(_total_recv) ;
+	return RSGraphSource::legend(i,v,show_value) ;
 }
 QString BWGraphSource::niceNumber(float v) const
 {
@@ -446,6 +487,7 @@ void BWGraphSource::setUnit(int unit)
 
     recomputeCurrentCurves() ;
 }
+
 void BWGraphSource::setDirection(int dir)
 {
     if(dir == _current_direction)

retroshare-gui/src/gui/statistics/BWGraph.h

@@ -13,6 +13,14 @@ public:
         std::list<RSTrafficClue> out_rstcl ;
         std::list<RSTrafficClue>  in_rstcl ;
     };
+    class RsServiceInfoWithNames: public RsServiceInfo
+    {
+    public:
+        RsServiceInfoWithNames(const RsServiceInfo& s) : RsServiceInfo(s) {}
+        RsServiceInfoWithNames(){}
+
+		std::map<uint8_t,std::string> item_names ;
+    };
 
     BWGraphSource() ;
 
@@ -25,7 +33,7 @@ public:
 
     virtual void getValues(std::map<std::string,float>& values) const;
     virtual QString displayValue(float v) const;
-    virtual QString legend(int i,float v) const;
+    virtual QString legend(int i,float v,bool show_value=true) const;
     virtual void update();
     QString unitName() const ;
 
@@ -45,6 +53,7 @@ public:
 
 protected:
     void convertTrafficClueToValues(const std::list<RSTrafficClue> &lst, std::map<std::string, float> &vals) const;
+	std::string makeSubItemName(uint16_t service_id,uint8_t sub_item_type) const;
     void recomputeCurrentCurves() ;
     std::string visibleFriendName(const RsPeerId &pid) const ;
 
@@ -67,7 +76,7 @@ private:
     std::map<RsPeerId,std::string> mVisibleFriends ;
     std::set<uint16_t> mVisibleServices ;
 
-    mutable std::map<uint16_t,RsServiceInfo> mServiceInfoMap ;
+    mutable std::map<uint16_t,RsServiceInfoWithNames> mServiceInfoMap ;
 };
 
 class BWGraph: public RSGraphWidget

retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp

@@ -28,13 +28,18 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
     ui.bwgraph_BW->setSelector(BWGraphSource::SELECTOR_TYPE_SERVICE,BWGraphSource::GRAPH_TYPE_SUM) ;
     ui.bwgraph_BW->setUnit(BWGraphSource::UNIT_KILOBYTES) ;
 
+	ui.bwgraph_BW->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_LEGEND_CUMULATED) ;
+
+	updateUnitSelection(0);
+
     // Setup connections
 
-    QObject::connect(ui.friend_CB ,SIGNAL(currentIndexChanged(int)),this, SLOT( updateFriendSelection(int))) ;
+    QObject::connect(ui.friend_CB  ,SIGNAL(currentIndexChanged(int )),this, SLOT( updateFriendSelection(int ))) ;
-    QObject::connect(ui.updn_CB   ,SIGNAL(currentIndexChanged(int)),this, SLOT( updateUpDownSelection(int))) ;
+    QObject::connect(ui.updn_CB    ,SIGNAL(currentIndexChanged(int )),this, SLOT( updateUpDownSelection(int ))) ;
-    QObject::connect(ui.unit_CB   ,SIGNAL(currentIndexChanged(int)),this, SLOT(   updateUnitSelection(int))) ;
+    QObject::connect(ui.unit_CB    ,SIGNAL(currentIndexChanged(int )),this, SLOT(   updateUnitSelection(int ))) ;
-    QObject::connect(ui.service_CB,SIGNAL(currentIndexChanged(int)),this, SLOT(updateServiceSelection(int))) ;
+    QObject::connect(ui.service_CB ,SIGNAL(currentIndexChanged(int )),this, SLOT(updateServiceSelection(int ))) ;
-    QObject::connect(ui.logScale_CB,SIGNAL(toggled(bool)),this, SLOT(toggleLogScale(bool))) ;
+    QObject::connect(ui.legend_CB  ,SIGNAL(currentIndexChanged(int )),this, SLOT(      updateLegendType(int ))) ;
+    QObject::connect(ui.logScale_CB,SIGNAL(            toggled(bool)),this, SLOT(        toggleLogScale(bool))) ;
 
     // setup one timer for auto-update
 
@@ -156,6 +161,13 @@ void BandwidthStatsWidget::updateFriendSelection(int n)
         ui.bwgraph_BW->setSelector(BWGraphSource::SELECTOR_TYPE_FRIEND,BWGraphSource::GRAPH_TYPE_SINGLE,ui.friend_CB->itemData(ci,Qt::UserRole).toString().toStdString()) ;
     }
 }
+void BandwidthStatsWidget::updateLegendType(int n)
+{
+    if(n==0)
+        ui.bwgraph_BW->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_LEGEND_CUMULATED) ;
+    else
+        ui.bwgraph_BW->setFlags(RSGraphWidget::RSGRAPH_FLAGS_LEGEND_CUMULATED) ;
+}
 void BandwidthStatsWidget::updateServiceSelection(int n)
 {
     if(n == 0)
@@ -187,7 +199,13 @@ void BandwidthStatsWidget::updateUpDownSelection(int n)
 void BandwidthStatsWidget::updateUnitSelection(int n)
 {
     if(n==0)
+    {
         ui.bwgraph_BW->setUnit(BWGraphSource::UNIT_KILOBYTES) ;
+        ui.legend_CB->setItemText(1,tr("Average"));
+    }
     else
+    {
         ui.bwgraph_BW->setUnit(BWGraphSource::UNIT_COUNT) ;
+        ui.legend_CB->setItemText(1,tr("Total"));
+    }
 }

retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h

@@ -15,7 +15,8 @@ protected slots:
     void updateUpDownSelection(int n);
     void updateUnitSelection(int n);
     void toggleLogScale(bool b);
-    
+    void updateLegendType(int n);
+
 private:
     Ui::BwStatsWidget ui;
 

retroshare-gui/src/gui/statistics/BandwidthStatsWidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1128</width>
+    <width>1148</width>
     <height>385</height>
    </rect>
   </property>
@@ -14,7 +14,16 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -103,6 +112,27 @@
       <item>
        <widget class="QComboBox" name="unit_CB"/>
       </item>
+      <item>
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Legend:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="legend_CB">
+        <item>
+         <property name="text">
+          <string>Current</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Total</string>
+         </property>
+        </item>
+       </widget>
+      </item>
       <item>
        <widget class="QCheckBox" name="logScale_CB">
         <property name="text">