added pie vizualization as an option to BW graph stats

Author: csoler

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

@@ -32,6 +32,12 @@
 #include <QWheelEvent>
 #include <QTimer>
 
+#include <QChartView>
+#include <QChart>
+#include <QPieSeries>
+#include <QPieSlice>
+#include <QValueAxis>
+
 #include <retroshare-gui/RsAutoUpdatePage.h>
 #include "rshare.h"
 #include "RSGraphWidget.h"
@@ -259,32 +265,38 @@ void RSGraphWidget::setTimeScale(float pixels_per_second)
     _time_scale =pixels_per_second ;
 }
 
+void RSGraphWidget::setViewMode(ViewMode m)
+{
+    _viewMode = m;
+}
 /** Default contructor */
 RSGraphWidget::RSGraphWidget(QWidget *parent)
 : QFrame(parent)
 {
+    _viewMode = ViewMode::History;
+    _mousePressed = false;
     _source =NULL;
-  _painter = new QPainter();
+    _painter = new QPainter();
 
-  /* Initialize graph values */
-  _maxPoints = getNumPoints();
-  _maxValue = MINUSER_SCALE;
+    /* Initialize graph values */
+    _maxPoints = getNumPoints();
+    _maxValue = MINUSER_SCALE;
 
-  _linewidthscale = 1.0f;
-  _opacity = 0.6 ;
-  _flags = 0;
-  _time_scale = 5.0f ; // in pixels per second.
-  _time_filter = 1.0f ;
-  _timer = new QTimer ;
-  QObject::connect(_timer,SIGNAL(timeout()),this,SLOT(updateIfPossible())) ;
+    _linewidthscale = 1.0f;
+    _opacity = 0.6 ;
+    _flags = 0;
+    _time_scale = 5.0f ; // in pixels per second.
+    _time_filter = 1.0f ;
+    _timer = new QTimer ;
+    QObject::connect(_timer,SIGNAL(timeout()),this,SLOT(updateIfPossible())) ;
 
 
-  _y_scale = 1.0f ;
-  _timer->start(1000);
+    _y_scale = 1.0f ;
+    _timer->start(1000);
 
     float FS = QFontMetricsF(font()).height();
-  setMinimumHeight(12*FS);
-  _graph_base = FS*GRAPH_BASE;
+    setMinimumHeight(12*FS);
+    _graph_base = FS*GRAPH_BASE;
 }
 
 void RSGraphWidget::updateIfPossible()
@@ -353,14 +365,16 @@ void RSGraphWidget::paintEvent(QPaintEvent *)
   }
   _painter->drawRect(_rec);
 
-  /* Paint the scale */
-  paintScale1();
-
-  /* Plot the data */
-  paintData();
+  if(_viewMode == ViewMode::History)
+  {
+      /* Paint the scale */
+      paintScale1();
 
-  /* Paint the totals */
-  paintTotals();
+      /* Plot the data */
+      paintData();
+  }
+  else if(_viewMode == ViewMode::Slice)
+      paintTotals();
 
   // part of the scale that needs to write over the data curves.
   paintScale2();
@@ -592,16 +606,54 @@ void RSGraphWidget::paintDots(const QVector<QPointF>& points, QColor color)
 /** Paints selected total indicators on the graph. */
 void RSGraphWidget::paintTotals()
 {
+#ifdef UNUSED
     float FS = QFontMetricsF(font()).height();
     //float fact = FS/14.0 ;
-
   //int x = SCALE_WIDTH*fact + FS, y = 0;
   int rowHeight = FS;
 
 #if !defined(Q_OS_MAC)
   /* On Mac, we don't need vertical spacing between the text rows. */
   rowHeight += 5;
 #endif
+#endif
+
+  auto c = new QtCharts::QChart();
+  c->legend()->setVisible(true);
+  c->legend()->setAlignment(Qt::AlignRight);
+
+  auto axisY = new QtCharts::QValueAxis();
+  axisY->setTitleText("MB");
+  axisY->setLabelFormat("%.1f");
+  c->addAxis(axisY, Qt::AlignLeft);
+
+  std::vector<float> vals,tmp_vals;
+  _source->getCumulatedValues(tmp_vals);
+
+  for(int i=0;i<_source->n_values();++i)
+      if( _masked_entries.find(_source->displayName(i).toStdString()) == _masked_entries.end() )
+          vals.push_back(tmp_vals[i]);
+
+  float total = 0.0;
+  for(auto  v:vals) total += v;
+
+  if(total != 0.0)
+      for(auto& v:vals) v/=total;
+
+  auto pieSeries = new QtCharts::QPieSeries();
+  for(uint i=0;i<vals.size();++i)
+  {
+      QtCharts::QPieSlice *slice = pieSeries->append(_source->legend(i,vals[i],false),vals[i]);
+      slice->setLabelVisible(true);
+  }
+
+  c->resize(_rec.width(),_rec.height());
+  c->addSeries(pieSeries);
+
+  QGraphicsScene scene;
+  scene.addItem(c);
+  scene.setSceneRect(0, 0, _rec.width(), _rec.height());
+  scene.render(_painter, _rec, _rec);
 }
 
 /** Returns a formatted string with the correct size suffix. */
@@ -773,3 +825,21 @@ void RSGraphWidget::paintLegend()
       }
 }
 
+// These functions capture the cursor
+void RSGraphWidget::mousePressEvent(QMouseEvent *e)
+{
+    _mousePressed = true;
+    QFrame::mousePressEvent(e);
+}
+void RSGraphWidget::mouseMoveEvent(QMouseEvent *e)
+{
+    if(_mousePressed)
+        std::cerr << "e->x() = " << e->x() << std::endl;
+    QFrame::mouseMoveEvent(e);
+}
+void RSGraphWidget::mouseReleaseEvent(QMouseEvent *e)
+{
+    _mousePressed = false;
+    QFrame::mouseReleaseEvent(e);
+}
+

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

@@ -73,6 +73,7 @@ class RSGraphSource: public QObject
 
     virtual QString unitName() const { return "" ; }// overload to give your own unit name (KB/s, Users, etc)
 
+    // Number of curves available
     int n_values() const ;
 
     // Might be overloaded in order to show a fancy digit number with adaptive units.
@@ -155,6 +156,11 @@ class RSGraphWidget: public QFrame
 		SolidLine = 0,  /**< Plot bandwidth as solid lines. */
 		AreaGraph = 1   /**< Plot bandwidth as alpha blended area graphs. */
 	};
+    enum ViewMode
+    {
+        History = 0x00,  /**< Plots the full curves with time . */
+        Slice   = 0x01,  /**< Plots a slice of the curves at some point in time. */
+    };
 
 	/** Default Constructor */
 	RSGraphWidget(QWidget *parent = 0);
@@ -166,6 +172,8 @@ class RSGraphWidget: public QFrame
 	void setTimerPeriod(int miliseconds) ;				
 	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.
 
 	/** Add data points. */
 	//void addPoints(qreal rsDHT, qreal allDHT);
@@ -184,15 +192,21 @@ class RSGraphWidget: public QFrame
 	void resetFlags(uint32_t flag) { _flags &= ~flag ; }
 protected:
 	/** Overloaded QWidget::paintEvent() */
-	void paintEvent(QPaintEvent *event);
+    void paintEvent(QPaintEvent *event) override;
 
 //QSize QFrame::sizeHint() const;
 //	virtual QSizeF sizeHint( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
 
 protected slots:
 	void updateIfPossible() ;
 
-	virtual void wheelEvent(QWheelEvent *e);
+    virtual void wheelEvent(QWheelEvent *e) override;
+
+protected:
+    virtual void mousePressEvent(QMouseEvent *e) override;
+    virtual void mouseMoveEvent(QMouseEvent *e) override;
+    virtual void mouseReleaseEvent(QMouseEvent *e) override;
+
 private:
 	/** Gets the width of the desktop, the max # of points. */
 	int getNumPoints();
@@ -254,5 +268,8 @@ protected slots:
 	QTimer *_timer ;
 
 	RSGraphSource *_source ;
+
+    bool _mousePressed;
+    ViewMode _viewMode;
 };
 

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

@@ -564,17 +564,17 @@ QString BWGraphSource::niceNumber(float v) const
         return QString::number(v/(1024*1024.0*1024),'f',2) + " GB";
 }
 
-void BWGraphSource::setSelector(int selector_type,int graph_type,const std::string& selector_client_string)
+void BWGraphSource::setSelector(int selector_type,int selector_value,const std::string& selector_client_string)
 {
 #ifdef BWGRAPH_DEBUG
-    std::cerr << "Setting Graph Source selector to " << selector_type << " - " << graph_type << " - " << selector_client_string << std::endl;
+    std::cerr << "Setting Graph Source selector to " << selector_type << " - " << selector_value << " - " << selector_client_string << std::endl;
 #endif
 
     bool changed = false ;
 
-    if(selector_type == SELECTOR_TYPE_FRIEND && (_friend_graph_type != graph_type || (graph_type == GRAPH_TYPE_SINGLE && selector_client_string != _current_selected_friend.toStdString())))
+    if(selector_type == SELECTOR_TYPE_FRIEND && (_friend_graph_type != selector_value || (selector_value == GRAPH_TYPE_SINGLE && selector_client_string != _current_selected_friend.toStdString())))
     {
-	    if(graph_type ==  GRAPH_TYPE_SINGLE)
+        if(selector_value ==  GRAPH_TYPE_SINGLE)
 	    {
 
 		    RsPeerId ns(selector_client_string) ;
@@ -583,7 +583,7 @@ void BWGraphSource::setSelector(int selector_type,int graph_type,const std::stri
 		    {
 			    _current_selected_friend = ns ;
 			    changed = true ;
-			    _friend_graph_type = graph_type ;
+                _friend_graph_type = selector_value ;
 		    }
 
 		    else
@@ -592,13 +592,13 @@ void BWGraphSource::setSelector(int selector_type,int graph_type,const std::stri
 	    else
 	    {
 		    changed = true ;
-		    _friend_graph_type = graph_type ;
+            _friend_graph_type = selector_value ;
 	    }
     }
     else if(selector_type == SELECTOR_TYPE_SERVICE
-                    && (_service_graph_type != graph_type || (graph_type == GRAPH_TYPE_SINGLE && selector_client_string != QString::number(_current_selected_service,16).toStdString())))
+                    && (_service_graph_type != selector_value || (selector_value == GRAPH_TYPE_SINGLE && selector_client_string != QString::number(_current_selected_service,16).toStdString())))
     {
-	    if(graph_type ==  GRAPH_TYPE_SINGLE)
+        if(selector_value ==  GRAPH_TYPE_SINGLE)
 	    {
 		    //bool ok = false ;
 		    int tmp = QString::fromStdString(selector_client_string).toInt() ;
@@ -608,7 +608,7 @@ void BWGraphSource::setSelector(int selector_type,int graph_type,const std::stri
 			    _current_selected_service = tmp ;
 
 			    changed = true ;
-			    _service_graph_type = graph_type ;
+                _service_graph_type = selector_value ;
 		    }
                     else
 			    std::cerr << "(EE) Cannot set current service to " << selector_client_string << ": unrecognized service string." << std::endl;
@@ -617,7 +617,7 @@ void BWGraphSource::setSelector(int selector_type,int graph_type,const std::stri
 	    else
 	    {
 		    changed = true ;
-		    _service_graph_type = graph_type ;
+            _service_graph_type = selector_value ;
 	    }
     }
 

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

@@ -67,20 +67,20 @@ class BWGraphSource: public RSGraphSource
     BWGraphSource() ;
 	virtual ~BWGraphSource() {}
 
-    enum { SELECTOR_TYPE_FRIEND=0x00, SELECTOR_TYPE_SERVICE=0x01 };
-    enum { GRAPH_TYPE_SINGLE=0x00, GRAPH_TYPE_ALL=0x01, GRAPH_TYPE_SUM=0x02 };
-    enum { UNIT_KILOBYTES=0x00, UNIT_COUNT=0x01 };
-    enum { DIRECTION_DOWN=0x01,DIRECTION_UP=0x02 };	// can be combined using binary ops
-    enum { TIMING_INSTANT = 0x01,TIMING_CUMULATED=0x02 };
+    enum { GRAPH_TYPE_SINGLE    =0x00 ,GRAPH_TYPE_ALL       =0x01 ,GRAPH_TYPE_SUM    =0x02 };
+    enum { SELECTOR_TYPE_FRIEND =0x00 ,SELECTOR_TYPE_SERVICE=0x01 };
+    enum { UNIT_KILOBYTES       =0x00 ,UNIT_COUNT           =0x01 };
+    enum { DIRECTION_DOWN       =0x01 ,DIRECTION_UP         =0x02 };	// can be combined using binary ops
+    enum { TIMING_INSTANT       =0x00 ,TIMING_CUMULATED     =0x01 };
 
     // re-derived from RSGraphSource
 
-	virtual void getCumulatedValues(std::vector<float>& vals) const;
-    virtual void getValues(std::map<std::string,float>& values) const;
-    virtual QString displayValue(float v) const;
-    virtual QString legend(int i,float v,bool show_value=true) const;
-    virtual void update();
-    QString unitName() const ;
+    virtual void getCumulatedValues(std::vector<float>& vals) const override;
+    virtual void getValues(std::map<std::string,float>& values) const override;
+    virtual QString displayValue(float v) const override;
+    virtual QString legend(int i,float v,bool show_value=true) const override;
+    virtual void update() override;
+    QString unitName() const  override;
 
     // own methdods to control what's used to create displayed info
 
@@ -89,9 +89,9 @@ class BWGraphSource: public RSGraphSource
     void setUnit(int unit) ;
     void setTiming(int t) ;
 
-    int direction() const { return _current_direction ;}
-    int unit() const { return _current_unit ;}
-    int friendGraphType() const { return _friend_graph_type ;}
+    int direction()        const { return _current_direction ;}
+    int unit()             const { return _current_unit ;}
+    int friendGraphType()  const { return _friend_graph_type ;}
     int serviceGraphType() const { return _service_graph_type ;}
 
     const std::map<RsPeerId,std::string>& visibleFriends() const { return mVisibleFriends; }
@@ -166,10 +166,12 @@ class BWGraph: public RSGraphWidget
         BWGraph(QWidget *parent);
         ~BWGraph();
 
-    void setSelector(int selector_type, int graph_type, const std::string& selector_client_string = std::string())  { _local_source->setSelector(selector_type,graph_type,selector_client_string) ; }
+    void setSelector(int selector_type, int selector_value, const std::string& selector_client_string = std::string())  { _local_source->setSelector(selector_type,selector_value,selector_client_string) ; }
     void setDirection(int dir) { _local_source->setDirection(dir); }
     void setTiming(int t) { _local_source->setTiming(t); }
     void setUnit(int unit) { _local_source->setUnit(unit) ;}
+    void setDataSliceDelay(int d) { _data_slice_delay = d; }
+
     void clear() { _local_source->clear() ; }
 
     int direction() const { return _local_source->direction(); }
@@ -178,4 +180,7 @@ class BWGraph: public RSGraphWidget
     const std::set<uint16_t>& visibleServices() const { return _local_source->visibleServices(); }
 protected:
         BWGraphSource *_local_source ;
+        int _data_slice_delay;
+
+        bool _mouse_pressed;
 };