Changeset 9048 in ntrip for trunk


Ignore:
Timestamp:
Aug 27, 2020, 3:21:28 PM (4 years ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src/RTCM3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r9046 r9048  
    16311631       * else. */
    16321632      if ((id >= 1057 && id <= 1068) ||
    1633           (id >= 1240 && id <= 1270) ||
    1634                   (id == 4076)) {
    1635         RTCM3coDecoder::e_type type = RTCM3coDecoder::RTCMssr;
     1633            (id >= 1240 && id <= 1270) ||
     1634                      (id == 4076)) {
     1635        if (!_coDecoders.contains(_staID.toLatin1())) {
     1636          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
     1637        }
     1638        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
    16361639        if (id == 4076) {
    1637           type = RTCM3coDecoder::IGSssr;
     1640          coDecoder->setSsrFormatType(RTCM3coDecoder::IGSssr);
    16381641        }
    1639         if (!_coDecoders.contains(_staID.toLatin1()))
    1640           _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID, type);
    1641         RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
     1642        else {
     1643          coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
     1644        }
    16421645        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
    16431646            errmsg) == success) {
  • trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

    r9025 r9048  
    5353// Constructor
    5454////////////////////////////////////////////////////////////////////////////
    55 RTCM3coDecoder::RTCM3coDecoder(const QString& staID, const e_type type) {
     55RTCM3coDecoder::RTCM3coDecoder(const QString& staID) {
    5656
    5757  _staID = staID;
     
    9797  _providerID[2] = -1;
    9898
    99   _type = type;
    10099  _ssrCorr = 0;
    101100}
  • trunk/BNC/src/RTCM3/RTCM3coDecoder.h

    r9032 r9048  
    3838 public:
    3939  enum e_type {RTCMssr, IGSssr};
    40   RTCM3coDecoder(const QString& staID, const e_type type);
     40  RTCM3coDecoder(const QString& staID);
    4141  virtual ~RTCM3coDecoder();
    4242  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
    43   virtual int   corrGPSEpochTime() const {return int(_lastTime.gpssec());}
     43  virtual int corrGPSEpochTime() const {return int(_lastTime.gpssec());}
     44  virtual void setSsrFormatType(const e_type type) {_type = type;}
    4445
    4546 signals:
Note: See TracChangeset for help on using the changeset viewer.