using same colors in legend and pie. Limited collection to 5 secs. Removed debug output

Author: csoler

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

@@ -79,6 +79,11 @@ RSGraphSource::~RSGraphSource()
 void RSGraphSource::clear()
 {
     _points.clear() ;
+#if QT_VERSION < 0x040700
+    _time_orig_msecs     = getCurrentMSecsSinceEpoch() ;
+#else
+    _time_orig_msecs     = QDateTime::currentMSecsSinceEpoch() ;
+#endif
 }
 void RSGraphSource::stop()
 {
@@ -121,36 +126,50 @@ void RSGraphSource::getSlicedValues(uint min_secs_ago,uint max_secs_ago,std::vec
         uint64_t max_ts = lst_it->second.back().first - min_secs_ago*1000;	// in _points the TS are w.r.t. now (in reverse) and in ms.
         uint64_t min_ts = lst_it->second.back().first - max_secs_ago*1000;
 
+#ifdef GRAPHWIDGET_DEBUG
         std::cerr << "Collecting data in \"" << lst_it->first << "\" between ts = " << min_ts << " and " << max_ts << std::endl;
+#endif
 
         for(const auto& p:lst_it->second)
         {
+#ifdef GRAPHWIDGET_DEBUG
             std::cerr << "      TS = " << p.first ;
             std::cerr << " data \"" << lst_it->first << "\": Found ts = " << p.first << ": value " << p.second ;
+#endif
 
             if((uint64_t)p.first >= min_ts && (uint64_t)p.first <= max_ts)
             {
                 v.first.v += p.second;
                 v.second.v++;
 
+#ifdef GRAPHWIDGET_DEBUG
                 std::cerr << " Kept."<< std::endl;
+#endif
             }
+#ifdef GRAPHWIDGET_DEBUG
             else
                 std::cerr << std::endl;
+#endif
         }
+#ifdef GRAPHWIDGET_DEBUG
         std::cerr << "  total value = " << v.first.v << "  --  " << v.second.v << std::endl;
+#endif
     }
 
     // now average values when multiple values have been collected.
 
+#ifdef GRAPHWIDGET_DEBUG
     std::cerr << "Computed values: " << collected_vals.size() << std::endl;
+#endif
 
     for(uint i=0;i<collected_vals.size();++i)
     {
         const auto& v(collected_vals[i]);
 
         vals.push_back((v.second.v > 0)?(v.first.v/v.second.v):0.0);
+#ifdef GRAPHWIDGET_DEBUG
         std::cerr << "  \"" << displayName(i).toStdString() << "\" " << vals.back() << "  (" << v.second.v << ")" << std::endl;
+#endif
     }
 }
 
@@ -335,15 +354,16 @@ RSGraphWidget::RSGraphWidget(QWidget *parent)
     _time_scale = 5.0f ; // in pixels per second.
     _time_filter = 1.0f ;
     _timer = new QTimer ;
-    QObject::connect(_timer,SIGNAL(timeout()),this,SLOT(updateIfPossible())) ;
-
+    _slice_proportion = 0.0;
 
     _y_scale = 1.0f ;
     _timer->start(1000);
 
     float FS = QFontMetricsF(font()).height();
     setMinimumHeight(12*FS);
     _graph_base = FS*GRAPH_BASE;
+
+    QObject::connect(_timer,SIGNAL(timeout()),this,SLOT(updateIfPossible())) ;
 }
 
 void RSGraphWidget::updateIfPossible()
@@ -675,15 +695,27 @@ void RSGraphWidget::paintTotals()
   c->addAxis(axisY, Qt::AlignLeft);
 
   std::vector<float> vals;
-  _source->getSlicedValues(0,5,vals);
+
+  qint64 total_duration_secs = _source->totalCollectedTime()/1000.0;
+#ifdef GRAPHWIDGET_DEBUG
+  std::cerr << "Total duration secs: " << total_duration_secs << std::endl;
+#endif
+  //_source->getSlicedValues( total_duration_secs * _slice_proportion,total_duration_secs * _slice_proportion + 5,vals);
+  _source->getSlicedValues( 0,5,vals);
+
+  float max_val = 0.0f;
+  for(auto v:vals)
+      max_val = std::max(max_val,v);
 
   auto pieSeries = new QtCharts::QPieSeries();
 
   for(uint i=0;i<vals.size();++i)
       if( _masked_entries.find(_source->displayName(i).toStdString()) == _masked_entries.end() )
       {
           QtCharts::QPieSlice *slice = pieSeries->append(_source->legend(i,vals[i],false),vals[i]);
-          slice->setLabelVisible(true);
+
+          slice->setColor( getColor(_source->displayName(i).toStdString()) );
+          slice->setLabelVisible(vals[i] > 0.05*max_val);
       }
 
   c->resize(_rec.width(),_rec.height());
@@ -874,6 +906,10 @@ void RSGraphWidget::mouseMoveEvent(QMouseEvent *e)
 {
     if(_mousePressed)
         std::cerr << "e->x() = " << e->x() << std::endl;
+
+    setSliceProportion(e->x() / (float)width());
+    updateIfPossible();
+
     QFrame::mouseMoveEvent(e);
 }
 void RSGraphWidget::mouseReleaseEvent(QMouseEvent *e)

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

@@ -114,6 +114,9 @@ class RSGraphSource: public QObject
 
     void setDigits(int d) { _digits = d ;}
 
+    // returns the total time of available data in ms
+    qint64 totalCollectedTime() const { return getTime() ; }
+
 protected slots:
     // Calls the internal source for a new data points; called by the timer. You might want to overload this
     // if the collection system needs it. Otherwise, the default method will call getValues()
@@ -181,7 +184,7 @@ class RSGraphWidget: public QFrame
 	void setSource(RSGraphSource *gs) ;
 	void setTimeScale(float pixels_per_second) ;
     void setViewMode(ViewMode m) ;
-    void setSliceProportion(float f) ; // float between 0 and 1. 0 means newest 1 means oldest.
+    void setSliceProportion(float f) { _slice_proportion = std::max(0.0f,std::min(f,1.0f)); } ; // float between 0 and 1. 0 means newest 1 means oldest.
 
 	/** Add data points. */
 	//void addPoints(qreal rsDHT, qreal allDHT);
@@ -265,8 +268,9 @@ protected slots:
 	std::set<std::string> _masked_entries ;
 
 	qreal _time_scale ; // horizontal scale in pixels per sec.
-        qreal _time_filter ; // time filter. Goes from 0 to infinity. Will be converted into 1-1/(1+f)
-        float _linewidthscale ;
+    qreal _time_filter ; // time filter. Goes from 0 to infinity. Will be converted into 1-1/(1+f)
+    float _linewidthscale ;
+    float _slice_proportion; // part of the recorded data tht is averaged for pie charts. Goes between 0 (most recent) and 1 (oldest)
 
 	/** Show the respective lines and counters. */
 	//bool _showRSDHT;

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

@@ -29,7 +29,7 @@
 
 void BWGraphSource::update()
 {
-#ifndef BWGRAPH_DEBUG
+#ifdef BWGRAPH_DEBUG
     std::cerr << "Updating BW graphsource..." << std::endl;
 #endif
 
@@ -44,7 +44,7 @@ void BWGraphSource::update()
                 auto& t = tmap[PeerSrvSubsrv(c)];
                 t.cumulated_size  += c.size;
                 t.cumulated_count += c.count;
-#ifndef BWGRAPH_DEBUG
+#ifdef BWGRAPH_DEBUG
                 std::cerr << "Pushing " << c.TS << "  " << c.peer_id << "  " << c.service_id << "  " << (int)c.service_sub_id << " into cumulated map" << std::endl;
 #endif
             }
@@ -456,8 +456,6 @@ void BWGraphSource::convertTrafficClueToValues(const std::list<RSTrafficClueExt>
 				total += *it;
 
             vals[QString("Total").toStdString()] = select_value(total);
-            std::cerr << "Total is " << total << std::endl;
-            std::cerr << "Value is " << select_value(total) << std::endl;
 		}
 			break ;
 		}
@@ -648,7 +646,6 @@ void BWGraphSource::setDirection(int dir)
 
 void BWGraphSource::setTiming(int t)
 {
-    std::cerr << "BWGraphSource: updating" << std::endl;
     if(t == _current_timing)
         return;
 
@@ -657,7 +654,7 @@ void BWGraphSource::setTiming(int t)
 }
 void BWGraphSource::recomputeCurrentCurves()
 {
-#ifndef BWGRAPH_DEBUG
+#ifdef BWGRAPH_DEBUG
     std::cerr << "BWGraphSource: recomputing current curves." << std::endl;
 #endif
 
@@ -708,7 +705,6 @@ BWGraph::BWGraph(QWidget *parent) : RSGraphWidget(parent)
 {
     _local_source = new BWGraphSource() ;
 
-    std::cerr << "creaitng new BWGraph Source " << (void*)_local_source << std::endl;
     _local_source->setCollectionTimeLimit(30*60*1000) ; // 30  mins
     _local_source->setCollectionTimePeriod(1000) ;      // collect every second
     _local_source->setDigits(2) ;

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

@@ -45,7 +45,7 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
     ui.service_CB->addItem(tr("All")) ;
 
     ui.data_CB->addItem(tr("history (curves)")) ;
-    ui.data_CB->addItem(tr("latest (pie)")) ;
+    ui.data_CB->addItem(tr("last 5 secs. (pie)")) ;
 
     ui.timing_CB->addItem(tr("real time")) ;
     ui.timing_CB->addItem(tr("cumulated")) ;
@@ -281,7 +281,6 @@ void BandwidthStatsWidget::updateDataSelection(int n)
 
 void BandwidthStatsWidget::updateTimingSelection(int n)
 {
-    std::cerr << "updating timing to " << n << " !" << std::endl;
     if(n==0)
     {
         ui.bwgraph_BW->setTiming(BWGraphSource::TIMING_INSTANT) ;