Changeset 223 for trunk/src/gui/bwgraph/bwgraph.cpp

Timestamp:

02/02/06 03:33:35 (3 years ago)

Author:

hipplej

Message:

A little more progress on the graph. All that's left is drawing the lines.

Files:

• trunk/src/gui/bwgraph/bwgraph.cpp (modified) (13 diffs)

trunk/src/gui/bwgraph/bwgraph.cpp

@@ -27 +27 @@
 #define DATETIME_FMT  "MMM dd hh:mm:ss:zzz"
 
-/** Default constructor **/
+/** Default constructor */
 BandwidthGraph::BandwidthGraph(TorControl *torControl, QWidget *parent, Qt::WFlags f)
 : QDialog(parent, f)
 {
-  /** Invoke Qt Designer generated QObject setup routine */
+  /* Invoke Qt Designer generated QObject setup routine */
   ui.setupUi(this);
 
-  /** Create Bandwidth Graph related QObjects */
+  /* Create Bandwidth Graph related QObjects */
   _settings = new VidaliaSettings();
-  _timer = new QTimer(this);
-  
-  /** Bind events to actions */
+  
+  /* Bind events to actions */
   createActions();
 
-  /** Ask Tor to notify us about bandwidth updates */
+  /* Ask Tor to notify us about bandwidth updates */
   _torControl = torControl;
   _torControl->setEvent(TorEvents::Bandwidth, this, true);
-  
-  /** Start the update timer **/
-  _timer->start(REFRESH_RATE);
-
-  /** Initialize Sent/Receive data counters */
+
+  /* Initialize Sent/Receive data counters */
   reset();
-
-  /** Hide Bandwidth Graph Settings frame */
+  
+  /* Hide Bandwidth Graph Settings frame */
   showSettingsFrame(false);
 
-  /** Turn off opacity group on unsupported platforms */
+  /* Turn off opacity group on unsupported platforms */
 #if defined(Q_WS_WIN)
   if(!(QSysInfo::WV_2000 <= QSysInfo::WindowsVersion <= QSysInfo::WV_2003)) {
@@ -66 +62 @@
 }
 
-/** Default destructor **/
+/** Default destructor */
 BandwidthGraph::~BandwidthGraph()
 {
@@ -72 +68 @@
     delete _settings;
   }
-  /* Unregister this object for bandwidth update events */
-  _torControl->setEvent(TorEvents::Bandwidth, this, false);
 }
 
@@ -79 +73 @@
  Custom event handler. Checks if the event is a bandwidth update event. If it
  is, it will add the data point to the history and updates the graph.
-**/
+*/
 void
 BandwidthGraph::customEvent(QEvent *event)
@@ -91 +85 @@
 /**
  Binds events to actions
-**/
+*/
 void
 BandwidthGraph::createActions()
 {
-//  connect(_timer, SIGNAL(timeout()),
-//      this, SLOT(updateGraph()));
-  
   connect(ui.btnToggleSettings, SIGNAL(toggled(bool)),
       this, SLOT(showSettingsFrame(bool)));
@@ -115 +106 @@
 
 /**
- Fetches new statistics and plots them on the graph
- and adds them to the data counters
-**/
+ Adds new data to the graph and the counters
+*/
 void
 BandwidthGraph::updateGraph(quint64 bytesRead, quint64 bytesWritten)
 {
-  // add data points to graph
-  // add data value to counters
-
-  /* Obviously this isn't what you're going to do with the data, but this lets
-   * you see that it's working in the meantime. */
-  ui.lblSent->setText(QString::number(bytesRead));
-  ui.lblReceived->setText(QString::number(bytesWritten));
+  /* Send the data in kilobits */
+  ui.frmGraph->addPoints(bytesRead/1000.0, bytesWritten/1000.0);
+  ui.lblSent->setText(addDataToStr(bytesWritten, _totalSent));
+  ui.lblReceived->setText(addDataToStr(bytesRead, _totalReceived));
+}
+
+/**
+ Adds data to the total counters and returns a correctly
+ formatted string with the correct size suffix
+*/
+QString
+BandwidthGraph::addDataToStr(quint64 data, quint64 &total)
+{
+  total += data;
+
+  /* Determine the correct size suffix */
+  if (total < 1000) {
+    /* Use bytes suffix */
+    return tr("%1 bytes").arg(total, 0);
+  } else if (total < 1000000) {
+    /* Use KB suffix */
+    return tr("%1 KB").arg(total/1000.0, 0, 'f', 2);
+  } else if (total < 1000000000) {
+    /* Use MB suffix */
+    return tr("%1 MB").arg(total/1000000.0, 0, 'f', 2);
+  } else {
+    /* Use GB suffix */
+    return tr("%1 MB").arg(total/1000000000.0, 0, 'f', 2);
+  }
 }
 
 /**
  Loads the saved Bandwidth Graph settings
-**/
+*/
 void
 BandwidthGraph::loadSettings()
 {
-  /** Set window opacity slider widget **/
+  /* Set window opacity slider widget */
   ui.sldrOpacity->setValue(_settings->getBWGraphOpacity());
 
-  /** Set the line filter checkboxes accordingly **/
+  /* Set the line filter checkboxes accordingly */
   uint filter = _settings->getBWGraphFilter();
   ui.chkReceiveRate->setChecked(filter & BWGRAPH_REC);
   ui.chkSendRate->setChecked(filter & BWGRAPH_SEND);
 
-  /** Set graph frame settings **/
+  /* Set graph frame settings */
   ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
                                ui.chkSendRate->isChecked());
@@ -151 +163 @@
 /** 
  Resets the Sent/Received data counters and the log start time
-**/
+*/
 void
 BandwidthGraph::reset()
 {
-  /** Reset the data counter labels **/
-  ui.lblSent->setText(tr("0.0 MB"));
-  ui.lblReceived->setText(tr("0.0 MB"));
-
-  /** Reset the log start timer **/
+  /* Reset the data total counters */
+  _totalSent = 0;
+  _totalReceived = 0;
+  
+  /* Reset the data counter labels */
+  ui.lblSent->setText(tr("0 bytes"));
+  ui.lblReceived->setText(tr("0 bytes"));
+
+  /* Reset the data counter clock */
   ui.lblStartTime->setText(QDateTime::currentDateTime().toString(DATETIME_FMT));
 
-  /** Reset the graph **/
+  /* Reset the graph */
   ui.frmGraph->resetGraph();
 }
@@ -168 +184 @@
 /**
  Saves the Bandwidth Graph settings and adjusts the graph if necessary
-**/
+*/
 void
 BandwidthGraph::saveChanges()
 {
-  /** Hide the settings frame and reset toggle button **/
+  /* Hide the settings frame and reset toggle button */
   showSettingsFrame(false);
   
-  /** Save the opacity **/
+  /* Save the opacity */
   _settings->setBWGraphOpacity(ui.sldrOpacity->value());
 
-  /** Save the line filter values **/
+  /* Save the line filter values */
   _settings->setBWGraphFilter(BWGRAPH_REC, ui.chkReceiveRate->isChecked());
   _settings->setBWGraphFilter(BWGRAPH_SEND, ui.chkSendRate->isChecked());
 
-  /** Update the graph frame settings **/
+  /* Update the graph frame settings */
   ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
                                ui.chkSendRate->isChecked());
@@ -189 +205 @@
 /** 
  Simply restores the previously saved settings
-**/
+*/
 void 
 BandwidthGraph::cancelChanges()
@@ -202 +218 @@
 /** 
  Toggles the Settings pane on and off, changes toggle button text
-**/
+*/
 void
 BandwidthGraph::showSettingsFrame(bool show)
@@ -219 +235 @@
 /**
  Sets the opacity of the Bandwidth Graph window
-**/
+*/
 void
 BandwidthGraph::setOpacity(int value)
@@ -225 +241 @@
   qreal newValue = value / 100.0;
 
-  /** Opacity only supported by Mac and Win32 **/
+  /* Opacity only supported by Mac and Win32 */
   #if defined(Q_WS_MAC)
     this->setWindowOpacity(newValue);
@@ -239 +255 @@
 /** 
  Overloads the default show() slot so we can set opacity
-**/
+*/
 void
 BandwidthGraph::show()