Changeset 9049 in ntrip for branches/BNC_2.12

Timestamp:

Aug 27, 2020, 3:34:22 PM (4 years ago)

Author:

stuerze

Message:

minor changes

Location:

branches/BNC_2.12/src/RTCM3

Files:

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

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

@@ -1619 +1619 @@
           (id >= 1240 && id <= 1270) ||
                   (id == 4076)) {
-        RTCM3coDecoder::e_type type = RTCM3coDecoder::RTCMssr;
+        if (!_coDecoders.contains(_staID.toLatin1())) {
+          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
+        }
+        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
         if (id == 4076) {
-          type = RTCM3coDecoder::IGSssr;
+          coDecoder->setSsrFormatType(RTCM3coDecoder::IGSssr);
         }
-        if (!_coDecoders.contains(_staID.toLatin1()))
-          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID, type);
-        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
+        else {
+          coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
+        }
         if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
             errmsg) == success) {

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

@@ -53 +53 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-RTCM3coDecoder::RTCM3coDecoder(const QString& staID, const e_type type) {
+RTCM3coDecoder::RTCM3coDecoder(const QString& staID) {
 
   _staID = staID;
@@ -97 +97 @@
   _providerID[2] = -1;
 
-  _type = type;
   _ssrCorr = 0;
 }

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

@@ -37 +37 @@
  public:
   enum e_type {RTCMssr, IGSssr};
-  RTCM3coDecoder(const QString& staID, const e_type type);
+  RTCM3coDecoder(const QString& staID);
   virtual ~RTCM3coDecoder();
   virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
-  virtual int   corrGPSEpochTime() const {return int(_lastTime.gpssec());}
+  virtual int corrGPSEpochTime() const {return int(_lastTime.gpssec());}
+  virtual void setSsrFormatType(const e_type type) {_type = type;}
 
  signals:
@@ -57 +58 @@
   void reopen();
   void checkProviderID();
-  std::string codeTypeToRnxType(char system, SsrCorr::CodeType type) const;
 
   std::ofstream*                        _out;