Changeset 9307 in ntrip for branches

Timestamp:

Dec 10, 2020, 3:40:35 PM (4 years ago)

Author:

stuerze

Message:

bug fixed

Location:

branches/BNC_2.12/src/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (2 diffs)
• RTCM3coDecoder.cpp (modified) (1 diff)
• RTCM3coDecoder.h (modified) (1 diff)

branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

@@ -1732 +1732 @@
         if (!_coDecoders.contains(_staID.toLatin1())) {
           _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
+          if (id == 4076) {
+            _coDecoders[_staID.toLatin1()]->initSsrFormatType(RTCM3coDecoder::IGSssr);
+          }
+          else {
+            _coDecoders[_staID.toLatin1()]->initSsrFormatType(RTCM3coDecoder::RTCMssr);
+          }
         }
         RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
-        if (id == 4076) {
-          coDecoder->setSsrFormatType(RTCM3coDecoder::IGSssr);
-        }
-        else {
-          coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
-        }
-        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
-            errmsg) == success) {
+        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize, errmsg) == success) {
           decoded = true;
         }
       }
-     else if (id >= 1070 && id <= 1237) { /* MSM */
+      else if (id >= 1070 && id <= 1237) { /* MSM */
         if (DecodeRTCM3MSM(_Message, _BlockSize))
           decoded = true;
@@ -1828 +1827 @@
   uint32_t crc = 0;
   int ii;
- while (size--) {
+  while (size--) {
     crc ^= (*buf++) << (16);
     for (ii = 0; ii < 8; ii++) {

branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.cpp

@@ -179 +179 @@
 
     int bytesused = 0;
-    if (_type == RTCMssr) {
-      _ssrCorr = new SsrCorrRtcm();
-    }
-    else {
-      _ssrCorr = new SsrCorrIgs();
-    }
+
     GCOB_RETURN irc = _ssrCorr->GetSSR(&_clkOrb, &_codeBias, &_vTEC, &_phaseBias,
                              _buffer.data(), _buffer.size(), &bytesused);

branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.h

@@ -41 +41 @@
   virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
   virtual int corrGPSEpochTime() const {return int(_lastTime.gpssec());}
-  virtual void setSsrFormatType(const e_type type) {_type = type;}
+  virtual void initSsrFormatType(const e_type type) {
+    _type = type;
+    if      (_type == RTCMssr) {
+      _ssrCorr = new SsrCorrRtcm();
+    }
+    else {
+      _ssrCorr = new SsrCorrIgs();
+    }
+  }
 
  signals: