Changeset 350 in ntrip

Timestamp:

Dec 13, 2006, 10:43:39 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (4 diffs)
• bnccaster.h (modified) (3 diffs)
• bncgetthread.cpp (modified) (4 diffs)
• bncgetthread.h (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -114 +114 @@
 // New Observations
 ////////////////////////////////////////////////////////////////////////////
-int bncCaster::newObs(const QByteArray& staID,
-                       bool firstObs, Observation* obs) {
+void bncCaster::newObs(const QByteArray& staID, const QUrl& mountPoint,
+                       bool firstObs, Observation* obs,
+                       const QByteArray& format) {
 
   QMutexLocker locker(&_mutex);
@@ -127 +128 @@
   obs->StatID[sizeof(obs->StatID)-1] = '\0';
         
+  // Prepare RINEX Output
+  // --------------------
+  if (_rinexWriters.find(obs->StatID) == _rinexWriters.end()) {
+    _rinexWriters.insert(obs->StatID, new bncRinex(obs->StatID, 
+                                                   mountPoint, format));
+  }
+  bncRinex* rnx = _rinexWriters.find(obs->StatID).value();
+  if (_samplingRate == 0 || iSec % _samplingRate == 0) {
+    rnx->deepCopy(obs);
+  }
+  rnx->dumpEpoch(newTime);
+
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
@@ -145 +158 @@
     }
     delete obs;
-    return 1;
+    return;
   }
 
@@ -159 +172 @@
     _lastDumpSec = newTime - _waitTime;
   }
-
-  return 0;
 }
 

trunk/BNC/bnccaster.h

@@ -32 +32 @@
 
 #include "RTCM/GPSDecoder.h"
+#include "bncrinex.h"
 
 class bncGetThread;
@@ -43 +44 @@
    void addGetThread(bncGetThread* getThread);
    int  numStations() const {return _staIDs.size();}
-   int  newObs(const QByteArray& staID, bool firstObs, Observation* obs);
+   void newObs(const QByteArray& staID, const QUrl& mountPoint,
+               bool firstObs, Observation* obs, const QByteArray& format);
 
  signals:
@@ -64 +66 @@
    QList<QTcpSocket*>*            _sockets;
    QList<QByteArray>              _staIDs;
+   QMap<QString, bncRinex*>       _rinexWriters;
    QList<bncGetThread*>           _threads;
    int                            _samplingRate;

trunk/BNC/bncgetthread.cpp

@@ -49 +49 @@
 #include "bnctabledlg.h"
 #include "bncapp.h"
-#include "bncutils.h"
 
 #include "RTCM/RTCM2Decoder.h"
@@ -61 +60 @@
 bncGetThread::bncGetThread(const QUrl& mountPoint, 
                            const QByteArray& format, int iMount) {
-  _decoder     = 0;
-  _mountPoint  = mountPoint;
-  _staID       = mountPoint.path().mid(1).toAscii();
-  _staID_orig  = _staID;
-  _format      = format;
-  _socket      = 0;
-  _timeOut     = 20*1000;  // 20 seconds
-  _nextSleep   =  1;       //  1 second
-  _iMount      = iMount;   // index in mountpoints array
-  _rinexWriter = 0;
+  _decoder    = 0;
+  _mountPoint = mountPoint;
+  _staID      = mountPoint.path().mid(1).toAscii();
+  _staID_orig = _staID;
+  _format     = format;
+  _socket     = 0;
+  _timeOut    = 20*1000;  // 20 seconds
+  _nextSleep  =  1;       //  1 second
+  _iMount     = iMount;   // index in mountpoints array
 
   // Check name conflict
@@ -89 +87 @@
     }
   }
-
-  _samplingRate = settings.value("rnxSampl").toInt();
 
   if (num > 0) {
@@ -292 +288 @@
         for (list<Observation*>::iterator it = _decoder->_obsList.begin(); 
              it != _decoder->_obsList.end(); it++) {
-
-          // Check observation epoch
-          // -----------------------
-          int    week;
-          double sec;
-          currentGPSWeeks(week, sec);
-          
-          const double secPerWeek = 7.0 * 24.0 * 3600.0;
-          const double maxDt      = 600.0;            
-
-          if (week < (*it)->GPSWeek) {
-            week += 1;
-            sec  -= secPerWeek;
-          }
-          if (week > (*it)->GPSWeek) {
-            week -= 1;
-            sec  += secPerWeek;
-          }
-          double dt = fabs(sec - (*it)->GPSWeeks);
-          if (week != (*it)->GPSWeek || dt > maxDt) {
-            emit( newMessage("Wrong observation epoch") );
-            delete (*it);
-            continue;
-          }
-
           emit newObs(_staID, *it);
           bool firstObs = (it == _decoder->_obsList.begin());
-          if ( _global_caster->newObs(_staID, firstObs, *it) == 0 ) {
-
-            if (_rinexWriter == 0) {
-              _rinexWriter = new bncRinex((*it)->StatID, _mountPoint, _format);
-            }
-
-            long iSec    = long(floor((*it)->GPSWeeks+0.5));
-            long newTime = (*it)->GPSWeek * 7*24*3600 + iSec;
-
-            if (_samplingRate == 0 || iSec % _samplingRate == 0) {
-              _rinexWriter->deepCopy(*it);
-            }
-            _rinexWriter->dumpEpoch(newTime);
-          }
-
-
+          _global_caster->newObs(_staID, _mountPoint, firstObs, *it, _format);
         }
         _decoder->_obsList.clear();

trunk/BNC/bncgetthread.h

@@ -32 +32 @@
 #include "RTCM/GPSDecoder.h"
 #include "bncconst.h"
-#include "bncrinex.h"
 
 class bncGetThread : public QThread {
@@ -69 +68 @@
    int         _nextSleep;
    int         _iMount;
-   int         _samplingRate;
-   bncRinex*   _rinexWriter;
 };