Changeset 3573 in ntrip for branches

Timestamp:

Dec 25, 2011, 7:50:18 PM (12 years ago)

Author:

mervart

Message:

 

Location:

branches/BNC_LM

Files:

• RTCM/GPSDecoder.h (modified) (3 diffs)
• bnc.pro (modified) (1 diff)
• bncgetthread.cpp (modified) (4 diffs)

branches/BNC_LM/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 initRinex(const QByteArray& staID, const QUrl& mountPoint,
+                 const QByteArray& latitude, const QByteArray& longitude, 
+                 const QByteArray& nmea, const QByteArray& ntripVersion);
+
+  void dumpRinexEpoch(const t_obs& obs, const QByteArray& format);
+
+  void setRinexReconnectFlag(bool flag);
 
   struct t_antInfo {
@@ -145 +158 @@
 
   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
 };
 

branches/BNC_LM/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    \

branches/BNC_LM/bncgetthread.cpp

@@ -317 +317 @@
   msleep(100); //sleep 0.1 sec
   
-////  _decoder->initRinex(_staID, _mountPoint, _latitude, _longitude, 
-////                               _nmea, _ntripVersion);
+  _decoder->initRinex(_staID, _mountPoint, _latitude, _longitude, 
+                               _nmea, _ntripVersion);
 
   if (_rawFile) {
@@ -542 +542 @@
         }
 
-        ////        decoder()->dumpRinexEpoch(obs, _format);
+        decoder()->dumpRinexEpoch(obs, _format);
 
         // PPP Client
@@ -585 +585 @@
         itDec.next();
         GPSDecoder* decoder = itDec.value();
-        ///        decoder->setRinexReconnectFlag(false);
+        decoder->setRinexReconnectFlag(false);
       }
     }
     else {
-      ///      _decoder->setRinexReconnectFlag(false);
+      _decoder->setRinexReconnectFlag(false);
     }
     return success;
@@ -656 +656 @@
       itDec.next();
       GPSDecoder* decoder = itDec.value();
-      ///      decoder->setRinexReconnectFlag(false);
+      decoder->setRinexReconnectFlag(false);
     }
   }
   else {
-    ///   _decoder->setRinexReconnectFlag(false);
+   _decoder->setRinexReconnectFlag(false);
   }