Changeset 1936 in ntrip

Timestamp:

Nov 12, 2009, 9:08:13 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncfigure.cpp (modified) (4 diffs)
• bncfigure.h (modified) (1 diff)

trunk/BNC/bncfigure.cpp

@@ -64 +64 @@
 
   _counter = 0;
+  _maxRate = 0;
 
   QMapIterator<QByteArray, sumAndMean*> it1(_bytes);
@@ -104 +105 @@
   // -----------------------------------------------------------
   if (_counter == MAXCOUNTER) {
+    _maxRate = 0.0;
     QMapIterator<QByteArray, sumAndMean*> it(_bytes);
     while (it.hasNext()) {
       it.next();
       it.value()->_mean = it.value()->_sum / _counter;
-        it.value()->_sum  = 0.0;
-     }
+      it.value()->_sum  = 0.0;
+      if (it.value()->_mean > _maxRate) {
+        _maxRate = it.value()->_mean;
+      }
+    }
     _counter = 0;
   }
@@ -121 +126 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncFigure::paintEvent(QPaintEvent *) {
-  QRectF rectangle(0, 0, 640, 180);
-  QBrush rBrush(Qt::white,Qt::SolidPattern);
+
+  int xMin =   0;
+  int xMax = 640;
+  int yMin =   0;
+  int yMax = 180;
+
   QPainter painter(this);
-  painter.fillRect(rectangle,rBrush);
-  painter.drawRect(rectangle);
-  QLine line(50, 140, 630, 140);
-  painter.drawLine(line);
-  line.setLine(50, 140, 50, 10);
-  painter.drawLine(line);
-  QPoint textP(40, 140);
-  painter.drawText(textP, tr("0"));
-  textP.setX(20);
-  textP.setY(25);
-  painter.drawText(textP, tr("3000"));
-  int anker=0;
-  textP.setY(160);
-  painter.drawText(textP, tr(QTime::currentTime().toString().toAscii()));
-  textP.setX(300);
+
+  // y-axis
+  // ------
+  painter.drawLine(xMin+50, yMax-40, xMin+50, yMin+10);
+  painter.drawText(xMin+40, yMax-40, tr("0"));
+  painter.drawText(xMin+20, yMin+25, tr("100 %"));
+
+  // x-axis
+  // ------
+  painter.drawLine(xMin+50, yMax-40, xMax-10, yMax-40);
+
+  painter.drawText(xMin+10,yMax-10, 
+                   tr(QTime::currentTime().toString().toAscii()));
+
+  int anchor = 0;
 
   QMapIterator<QByteArray, sumAndMean*> it(_bytes);
@@ -145 +154 @@
     QByteArray staID = it.key();
     double     vv    = it.value()->_mean;
-    QRectF vrect((100+anker*40), (140-vv), (30), (vv));
-    QBrush xBrush(Qt::green,Qt::SolidPattern);
-    textP.setX(100+anker*40);
+
+    int xx = xMin+100+anchor*40;
+
+    painter.drawText(xx, yMax-10, staID);
+
+    QRectF vrect(xx, yMax-40-vv, 30, vv);
+    QBrush xBrush(Qt::blue,Qt::SolidPattern);
     painter.fillRect(vrect,xBrush);
     painter.drawRect(vrect);
-    painter.drawText(textP, staID);
-    anker++;
+    anchor++;
   }
 }

trunk/BNC/bncfigure.h

@@ -51 +51 @@
   QMutex                        _mutex;
   int                           _counter;
+  double                        _maxRate;
 };