Changeset 1930 in ntrip for trunk/BNC

Timestamp:

Nov 11, 2009, 8:53:25 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncwindow.cpp (modified) (3 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/bncwindow.cpp

@@ -65 +65 @@
     QUrl        url(hlp[0]);
     QByteArray  staID = url.path().mid(1).toAscii();
-    double* bb = new double[2]; bb[0] = 0.0; bb[1] = 0.0;
-    _bytes[staID] = bb;
+    _bytes[staID] = new sumAndMean();
   }
   slotNextAnimationFrame();
@@ -79 +78 @@
 ////////////////////////////////////////////////////////////////////////////
 void FWidget::slotNewData(const QByteArray staID, double nbyte) {
-  cout << staID.data() << " " << nbyte << endl;
-  QMap<QByteArray, double*>::const_iterator it = _bytes.find(staID);
+  QMap<QByteArray, sumAndMean*>::const_iterator it = _bytes.find(staID);
   if (it != _bytes.end()) {
-    it.value()[0] += nbyte;
+    it.value()->_sum += nbyte;
   }
 }
@@ -115 +113 @@
   textP.setX(300);
 
-  QMapIterator<QByteArray, double*> it(_bytes);
+  QMapIterator<QByteArray, sumAndMean*> it(_bytes);
   while (it.hasNext()) {
     it.next();
     QByteArray staID    = it.key();
-    double     bytesnew = it.value()[0];
+    double     bytesnew = it.value()->_sum;
     double     vv       = bytesnew/30;
     QRectF vrect((100+anker*40), (140-vv), (30), (vv));

trunk/BNC/bncwindow.h

@@ -44 +44 @@
   void slotNextAnimationFrame();
  private:
-  QMap<QByteArray, double*> _bytes;
+  class sumAndMean {
+   public:
+    sumAndMean() {_mean = 0.0; _sum = 0.0;}
+    ~sumAndMean() {}
+    double _mean;
+    double _sum;
+  };
+  QMap<QByteArray, sumAndMean*> _bytes;
 };