Changeset 6443 in ntrip for trunk/BNC/src/RTCM

Timestamp:

Dec 26, 2014, 12:47:27 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM

Files:

• RTCM2Decoder.cpp (modified) (2 diffs)
• RTCM2Decoder.h (modified) (2 diffs)

trunk/BNC/src/RTCM/RTCM2Decoder.cpp

@@ -55 +55 @@
 // 
 
-RTCM2Decoder::RTCM2Decoder(const std::string& ID) : bncEphUser(true) {
+RTCM2Decoder::RTCM2Decoder(const std::string& ID) : _ephUser(true) {
   _ID = ID;
 }
@@ -352 +352 @@
 
       // Select corresponding ephemerides
-      if      (ephLast(prn) && ephLast(prn)->IOD() == IODcorr) {
-        eph = ephLast(prn);
-      }
-      else if (ephPrev(prn) && ephPrev(prn)->IOD() == IODcorr) {
-        eph = ephPrev(prn);
+      const t_eph* ephLast = _ephUser.ephLast(prn);
+      const t_eph* ephPrev = _ephUser.ephPrev(prn);
+      if      (ephLast && ephLast->IOD() == IODcorr) {
+        eph = ephLast;
+      }
+      else if (ephPrev && ephPrev->IOD() == IODcorr) {
+        eph = ephPrev;
       }
 

trunk/BNC/src/RTCM/RTCM2Decoder.h

@@ -36 +36 @@
 #include "bncephuser.h"
 
-class RTCM2Decoder: public bncEphUser, public GPSDecoder {
+class RTCM2Decoder: public GPSDecoder {
 
   public:
@@ -57 +57 @@
     void translateCorr2Obs(std::vector<std::string>& errmsg);
 
-    std::string            _ID;
-
-    std::string            _buffer;
-    rtcm2::RTCM2packet     _PP;
+    QMutex             _mutex;
+    std::string        _ID;
+    std::string        _buffer;
+    rtcm2::RTCM2packet _PP;
 
     // for messages 18, 19 decoding
-    rtcm2::RTCM2_Obs       _ObsBlock;
+    rtcm2::RTCM2_Obs   _ObsBlock;
 
     // for messages 20, 21 decoding
-    rtcm2::RTCM2_03           _msg03;
-    rtcm2::RTCM2_22           _msg22;
-    rtcm2::RTCM2_23           _msg23;
-    rtcm2::RTCM2_24           _msg24;
-    rtcm2::RTCM2_2021         _msg2021;
+    rtcm2::RTCM2_03    _msg03;
+    rtcm2::RTCM2_22    _msg22;
+    rtcm2::RTCM2_23    _msg23;
+    rtcm2::RTCM2_24    _msg24;
+    rtcm2::RTCM2_2021  _msg2021;
+    bncEphUser         _ephUser;        
 };