Changeset 3528 in ntrip

Timestamp:

Dec 16, 2011, 5:23:35 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• RTCM/GPSDecoder.cpp (added)
• RTCM/GPSDecoder.h (modified) (3 diffs)
• bnc.pro (modified) (1 diff)
• bncgetthread.cpp (modified) (7 diffs)
• bncgetthread.h (modified) (2 diffs)
• bncrinex.cpp (modified) (1 diff)
• bncrinex.h (modified) (3 diffs)

trunk/BNC/RTCM/GPSDecoder.h

@@ -33 +33 @@
 
 #include "bncconst.h"
+#include "bncrinex.h"
 
 class t_obs {
@@ -119 +120 @@
 class GPSDecoder {
  public:
-  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg) = 0;
+  GPSDecoder();
 
-  virtual ~GPSDecoder() {}
+  virtual ~GPSDecoder() {delete _rnx;}
+
+  virtual t_irc Decode(char* buffer, int bufLen, 
+                       std::vector<std::string>& errmsg) = 0;
+
 
   virtual int corrGPSEpochTime() const {return -1;}
+
+  void dumpRinexEpoch(const t_obs& obs, const QByteArray& format);
+
+  void setRinexReconnectFlag(bool flag);
 
   struct t_antInfo {
@@ -145 +154 @@
 
   QList<t_obs>     _obsList;
-  QList<int>       _typeList;  // RTCM   message types
-  QStringList      _antType;   // RTCM   antenna descriptor
-  QList<t_antInfo> _antList;   // RTCM   antenna XYZ
+  QList<int>       _typeList;  // RTCM message types
+  QStringList      _antType;   // RTCM antenna descriptor
+  QList<t_antInfo> _antList;   // RTCM antenna XYZ
+  bncRinex*        _rnx;       // RINEX writer
 };
 

trunk/BNC/bnc.pro

@@ -82 +82 @@
           upload/bncrtnetuploadcaster.cpp upload/bnccustomtrafo.cpp   \
           upload/bncephuploadcaster.cpp                               \
-          RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
+          RTCM/GPSDecoder.cpp RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp    \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
           RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex/rtcm3torinex.c    \

trunk/BNC/bncgetthread.cpp

@@ -52 +52 @@
 #include "bncapp.h"
 #include "bncutils.h"
-#include "bncrinex.h"
 #include "bnczerodecoder.h"
 #include "bncnetqueryv0.h"
@@ -116 +115 @@
 void bncGetThread::initialize() {
 
+  bncSettings settings;
+
   setTerminationEnabled(true);
 
@@ -127 +128 @@
   _nextSleep     = 0;
   _PPPclient     = 0;
-
-  bncSettings settings;
-
-  _miscMount = settings.value("miscMount").toString();
-
-  // RINEX writer
-  // ------------
-  _samplingRate = settings.value("rnxSampl").toInt();
-  if ( settings.value("rnxPath").toString().isEmpty() ) { 
-    _rnx = 0;
-  }
-  else {
-    _rnx = new bncRinex(_staID, _mountPoint, _latitude, _longitude, 
-                        _nmea, _ntripVersion);
-  }
+  _miscMount     = settings.value("miscMount").toString();
 
   // Serial Port
@@ -364 +351 @@
     delete it.value();
   }
-  delete _rnx;
   delete _rawFile;
   delete _serialOutFile;
@@ -515 +501 @@
         _prnLastEpo[prn] = obsTime;
 
-        // RINEX Output
-        // ------------
-        if (_rnx) {
-          if (_samplingRate == 0 || iSec % _samplingRate == 0) {
-            _rnx->deepCopy(obs);
-          }
-          _rnx->dumpEpoch(_format, obsTime);
-        }
-      
+        decoder()->dumpRinexEpoch(obs, _format);
+
         // PPP Client
         // ----------
@@ -560 +539 @@
   if (_query && _query->status() == bncNetQuery::running) {
     _nextSleep = 0;
-    if (_rnx) {
-      _rnx->setReconnectFlag(false);
+    QMapIterator<QString, GPSDecoder*> itDec(_decoders);
+    while (itDec.hasNext()) {
+      itDec.next();
+      GPSDecoder* decoder = itDec.value();
+      decoder->setRinexReconnectFlag(false);
     }
     return success;
@@ -623 +605 @@
   }
 
-  if (_rnx) {
-    _rnx->setReconnectFlag(true);
+  QMapIterator<QString, GPSDecoder*> itDec(_decoders);
+  while (itDec.hasNext()) {
+    itDec.next();
+    GPSDecoder* decoder = itDec.value();
+    decoder->setRinexReconnectFlag(false);
   }
 

trunk/BNC/bncgetthread.h

@@ -38 +38 @@
 #include "bncrawfile.h"
 
-class bncRinex;
 class QextSerialPort;
 class latencyChecker;
@@ -117 +116 @@
    int                        _nextSleep;
    int                        _iMount;
-   int                        _samplingRate;
-   bncRinex*                  _rnx;
    bncRawFile*                _rawFile;
    QextSerialPort*            _serialPort;

trunk/BNC/bncrinex.cpp

@@ -101 +101 @@
 
   _approxPos[0] = _approxPos[1] = _approxPos[2] = 0.0;
+
+  _samplingRate = settings.value("rnxSampl").toInt();
 }
 

trunk/BNC/bncrinex.h

@@ -26 +26 @@
 #define BNCRINEX_H
 
-#include <QByteArray>
-#include <QDateTime>
-#include <QList>
-
+#include <QtCore>
 #include <fstream>
 
 #include "bncconst.h"
-#include "RTCM/GPSDecoder.h"
+
+class t_obs;
 
 class bncRinex {
@@ -47 +45 @@
                                const QString& intStr, 
                                QDateTime* nextEpoch = 0);
+
+   int samplingRate() const {return _samplingRate;}
 
    void setApproxPos(double stax, double stay, double staz) {
@@ -90 +90 @@
    bool          _reloadDone;
    double        _approxPos[3];
+   int           _samplingRate;
 
    QMap<QString, int>  _slip_cnt_L1;