Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 20:06:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed updateTotals() method. Replaced it with costless on-the-fly update of totals

Browse source
This commit is contained in:
csoler 2017-09-27 22:26:14 +02:00
parent a00d2c912c
commit e66c0d1349
6 changed files with 69 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
retroshare-gui/src/gui/common/RSGraphWidget.cpp
View file

@ -102,8 +102,8 @@ QString RSGraphSource::displayValue(float v) const
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) ;
for(std::map<std::string,ZeroInitFloat>::const_iterator it = _totals.begin();it!=_totals.end();++it)
vals.push_back(it->second.v) ;
}
void RSGraphSource::getCurrentValues(std::vector<QPointF>& vals) const
{
@ -196,10 +196,15 @@ void RSGraphSource::update()
lst.push_back(std::make_pair(ms,it->second)) ;
for(std::list<std::pair<qint64,float> >::iterator it2=lst.begin();it2!=lst.end();)
float& total ( _totals[it->first].v );
total += it->second ;
for(std::list<std::pair<qint64,float> >::iterator it2=lst.begin();it2!=lst.end();) // This loop should be very fast, since we only remove the first elements, if applicable.
if( ms - (*it2).first > _time_limit_msecs)
{
//std::cerr << " removing old value with time " << (*it).first/1000.0f << std::endl;
total -= (*it2).second ;
it2 = lst.erase(it2) ;
}
else
@ -210,33 +215,34 @@ void RSGraphSource::update()
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) ;
++tmp;
_points.erase(it) ;
it=tmp ;
}
{
std::map<std::string,std::list<std::pair<qint64,float> > >::iterator tmp(it) ;
++tmp;
_totals.erase(it->first) ;
_points.erase(it) ;
it=tmp ;
}
else
++it ;
updateTotals();
}
#ifdef TO_REMOVE
void RSGraphSource::updateTotals()
{
std::cerr << "RsGraphSource::updateTotals() for " << _points.size() << " values" << std::endl;
// 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] ;
float& f = _totals[it->first].v ;
f = 0.0f ;
for(std::list<std::pair<qint64,float> >::const_iterator it2=it->second.begin();it2!=it->second.end();++it2)
f += (*it2).second ;
}
}
#endif
void RSGraphSource::reset()
{

15
retroshare-gui/src/gui/common/RSGraphWidget.h
View file

@ -43,6 +43,17 @@
#define RSDHT_COLOR Qt::magenta
#define ALLDHT_COLOR Qt::yellow
struct ZeroInitFloat
{
ZeroInitFloat() { v=0; }
ZeroInitFloat(float f) { v=f; }
float operator()() const { return v ; }
float& operator()() { return v ; }
float v ;
};
// This class provides a source value that the graph can retrieve on demand.
// In order to use your own source, derive from RSGraphSource and overload the value() method.
//
@ -102,13 +113,15 @@ 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.
#ifdef TO_REMOVE
void updateTotals();
#endif
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 ;
std::map<std::string, ZeroInitFloat> _totals ;
QTimer *_timer ;