Changeset 1972 in ntrip

Timestamp:

Nov 17, 2009, 3:37:14 PM (14 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• bncfigurelate.cpp (added)
• bncfigurelate.h (added)
• bncgetthread.cpp (modified) (1 diff)
• bncgetthread.h (modified) (1 diff)
• bncwindow.cpp (modified) (6 diffs)
• bncwindow.h (modified) (2 diffs)
• latencychecker.cpp (modified) (4 diffs)

trunk/BNC/bnc.pro

@@ -38 +38 @@
           bncnetqueryudp0.h bncudpport.h                              \ 
           bncserialport.h bncnetquerys.h bncfigure.h                  \ 
+          bncfigurelate.h                                             \ 
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -60 +61 @@
           bncnetqueryudp0.cpp bncudpport.cpp                          \
           bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
+          bncfigurelate.cpp                                           \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \

trunk/BNC/bncgetthread.cpp

@@ -425 +425 @@
 
       emit newLatency(_staID, _latencyChecker->meanLatency());
+      printf("%s: Mean latency in bncgetthread: %f ms\n", _staID.data(), _latencyChecker->meanLatency());
 
       scanRTCM();            

trunk/BNC/bncgetthread.h

@@ -75 +75 @@
  signals:
    void newBytes(QByteArray staID, double nbyte);
+   void newLatency(QByteArray staID, double mlate);
    void newObs(QByteArray staID, bool firstObs, p_obs obs);
    void newAntCrd(QByteArray staID, double xx, double yy, double zz, QByteArray antType);
    void newMessage(QByteArray msg, bool showOnScreen);
    void getThreadFinished(QByteArray staID);
-   void newLatency(QByteArray staID, double meanLatency);
 
  protected:

trunk/BNC/bncwindow.cpp

@@ -54 +54 @@
 #include "bncsettings.h"
 #include "bncfigure.h"
+#include "bncfigurelate.h"
 
 using namespace std;
@@ -64 +65 @@
 
   _bncFigure = new bncFigure(this);
+  _bncFigureLate = new bncFigureLate(this);
 
   int ww = QFontMetrics(this->font()).width('w');
@@ -354 +356 @@
   _log->setWhatsThis(tr("Records of BNC's activities are shown in the 'Log' tab. The message log covers the communication status between BNC and the NTRIP broadcaster as well as any problems that occur in the communication link, stream availability, stream delay, stream conversion etc."));
   _bncFigure->setWhatsThis(tr("The bandwidth consumtion per stream is shown in the 'Throughput' tab in bits per second (bps) or kilo bits per second (kbps)."));
+  _bncFigureLate->setWhatsThis(tr("Latency"));
   _ephV3CheckBox->setWhatsThis(tr("The default format for output of RINEX Navigation data containing Broadcast Ephemeris is RINEX Version 2.11. Select 'Version 3' if you want to output the ephemeris in RINEX Version 3 format."));
   _rnxV3CheckBox->setWhatsThis(tr("The default format for RINEX Observation files is RINEX Version 2.11. Select 'Version 3' if you want to save the observations in RINEX Version 3 format."));
@@ -399 +402 @@
   _loggroup->addTab(_log,tr("Log"));
   _loggroup->addTab(_bncFigure,tr("Throughput"));
+  _loggroup->addTab(_bncFigureLate,tr("Latency"));
 
   // Proxy Tab
@@ -1108 +1112 @@
 
   _bncFigure->updateMountPoints();
+  _bncFigureLate->updateMountPoints();
   _caster->slotReadMountPoints();
 }
@@ -1233 +1238 @@
         connect(thread, SIGNAL(newBytes(QByteArray, double)),
                 _bncFigure, SLOT(slotNewData(QByteArray, double)));
-
+        connect(thread, SIGNAL(newLatency(QByteArray, double)),
+                _bncFigureLate, SLOT(slotNewData(QByteArray, double)));
         break;
       }

trunk/BNC/bncwindow.h

@@ -48 +48 @@
 
 class bncFigure;
+class bncFigureLate;
 
 class bncWindow : public QMainWindow {
@@ -156 +157 @@
     QTabWidget* _loggroup;
     bncFigure*  _bncFigure;
+    bncFigureLate*  _bncFigureLate;
 
     bncCaster* _caster;

trunk/BNC/latencychecker.cpp

@@ -332 +332 @@
                   .arg(_numGaps)
                   .toAscii(), true) );
+                _meanLatency = _sumLat/_numLat*1000.;
               } else {
                 emit( newMessage(QString("%1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs")
@@ -341 +342 @@
                   .arg(_numLat)
                   .toAscii(), true) );
+                _meanLatency = _sumLat/_numLat*1000.;
               }
-              _meanLatency = _sumLat/_numLat;
             }
             _meanDiff  = _diffSecGPS / _numLat;
@@ -435 +436 @@
               .arg(_numGaps);
               emit(newMessage(QString(_staID + late ).toAscii(), true) );
+              _meanLatency = _sumLat/_numLat*1000.;
             } 
             else {
@@ -444 +446 @@
               .arg(_numLat);
               emit(newMessage(QString(_staID + late ).toAscii(), true) );
+              _meanLatency = _sumLat/_numLat*1000.;
             }
-            _meanLatency = _sumLat/_numLat;
           }
           _meanDiff = int(_diffSecGPS)/_numLat;