Changeset 2007 in ntrip

Timestamp:

Nov 22, 2009, 8:36:54 PM (14 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncfigure.cpp (modified) (3 diffs)
• bncfigurelate.cpp (modified) (2 diffs)

trunk/BNC/bncfigure.cpp

@@ -94 +94 @@
   QMap<QByteArray, sumAndMean*>::const_iterator it = _bytes.find(staID);
   if (it != _bytes.end()) {
-    it.value()->_sum += nbyte;
+    it.value()->_sum += nbyte*8.;
   }
 }
@@ -149 +149 @@
   painter.drawLine(xMin+60, int((yMax-yMin)*xLine), xMin+60, yMin+10);
 
+  double maxRateRounded;
   QString maxRateStr;
-  if      (8.0 * _maxRate < 1e3) {
-    maxRateStr = QString("%1 bps  ").arg(int(8.0 * _maxRate));
+  if (_maxRate < 1e3) {
+    maxRateRounded = int(_maxRate/200)*200 + 300;
+    maxRateStr = QString("%1 bps  ").arg(int(maxRateRounded/200)*200);
     painter.drawText(0, int((yMax-yMin)*xLine)-5, xMin+60,15,Qt::AlignRight,tr("0 bps  "));
   }
-  else if (8.0 * _maxRate < 1e6) {
-    maxRateStr = QString("%1 kbps  ").arg(int(8.0 * _maxRate / 1.e3));
+  else if (_maxRate < 1e6) {
+    maxRateRounded = int(_maxRate/1.e3)*1.e3 + 1500;
+    maxRateStr = QString("%1 kbps  ").arg(int(maxRateRounded/1.e3));
     painter.drawText(0, int((yMax-yMin)*xLine)-5, xMin+60,15,Qt::AlignRight,tr("0 kbps  "));
   }
   else {
-    maxRateStr = QString("%1 Mbps  ").arg(int(8.0 * _maxRate / 1.e6));
+    maxRateRounded = int(_maxRate/1.e6)*1.e6 + 1500000;
+    maxRateStr = QString("%1 Mbps  ").arg(int(maxRateRounded/1.e6));
     painter.drawText(0, int((yMax-yMin)*xLine)-5, xMin+60,15,Qt::AlignRight,tr("0 Mbps  "));
   }
 
   if(_maxRate > 0.0) {
-    painter.drawText(0, yMin+25-5, xMin+60,15,Qt::AlignRight,maxRateStr);
+    painter.drawText(0, yMin+20-5, xMin+60,15,Qt::AlignRight,maxRateStr);
   }
 
@@ -180 +184 @@
 
     if(_maxRate > 0.0) {
-      int yy = int(yLength * (it.value()->_mean / _maxRate));
+      int yy = int(yLength * (it.value()->_mean / maxRateRounded));
       QColor color = QColor::fromRgb(_ran[0][anchor],_ran[1][anchor],_ran[2][anchor],150);
       painter.fillRect(xx-13, int((yMax-yMin)*xLine)-yy, 9, yy, 

trunk/BNC/bncfigurelate.cpp

@@ -127 +127 @@
   }
 
+  double maxLateRounded;
   QString maxLateStr;
   if(maxLate < 1e3) {
-    maxLateStr = QString("%1 ms  ").arg(int(maxLate/200)*200);
+    maxLateRounded = int(maxLate/200)*200 + 300;
+    maxLateStr = QString("%1 ms  ").arg(int(maxLateRounded/200)*200);
     painter.drawText(0, int((yMax-yMin)*xLine)-5, xMin+60,15,Qt::AlignRight,tr("0 ms  "));
   }
   else if (maxLate < 6e4) {
-    maxLateStr = QString("%1 sec  ").arg(int(maxLate / 1.e3));
+    maxLateRounded = int(maxLate/1.e3)*1.e3 + 1500;
+    maxLateStr = QString("%1 sec  ").arg(int(maxLateRounded/1.e3));
     painter.drawText(0, int((yMax-yMin)*xLine)-5, xMin+60,15,Qt::AlignRight,tr("0 sec  "));
   }
   else {
-    maxLateStr = QString("%1 min  ").arg(int(maxLate / 6.e4));
+    maxLateRounded = int(maxLate / 6.e4)*6.e4 + 90000;
+    maxLateStr = QString("%1 min  ").arg(int(maxLateRounded/6.e4));
     painter.drawText(0, int((yMax-yMin)*xLine)-5, xMin+60,15,Qt::AlignRight,tr("0 min  "));
   }
 
   if(maxLate > 0.0) {
-    painter.drawText(0, yMin+25-5, xMin+60,15,Qt::AlignRight,maxLateStr);
+    painter.drawText(0, yMin+20-5, xMin+60,15,Qt::AlignRight,maxLateStr);
   }
 
@@ -158 +162 @@
 
     if(maxLate > 0.0) {
-      int yy = int(yLength * (it.value() / maxLate));
+      int yy = int(yLength * (it.value() / maxLateRounded));
       QColor color = QColor::fromHsv(180,200,120+_ran[2][anchor]);
       painter.fillRect(xx-13, int((yMax-yMin)*xLine)-yy, 9, yy,