Changeset 9049 in ntrip


Ignore:
Timestamp:
Aug 27, 2020, 3:34:22 PM (4 weeks ago)
Author:
stuerze
Message:

minor changes

Location:
branches/BNC_2.12/src/RTCM3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

    r9047 r9049  
    16191619          (id >= 1240 && id <= 1270) ||
    16201620                  (id == 4076)) {
    1621         RTCM3coDecoder::e_type type = RTCM3coDecoder::RTCMssr;
     1621        if (!_coDecoders.contains(_staID.toLatin1())) {
     1622          _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
     1623        }
     1624        RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
    16221625        if (id == 4076) {
    1623           type = RTCM3coDecoder::IGSssr;
     1626          coDecoder->setSsrFormatType(RTCM3coDecoder::IGSssr);
    16241627        }
    1625         if (!_coDecoders.contains(_staID.toLatin1()))
    1626           _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID, type);
    1627         RTCM3coDecoder* coDecoder = _coDecoders[_staID.toLatin1()];
     1628        else {
     1629          coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
     1630        }
    16281631        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
    16291632            errmsg) == success) {
  • branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.cpp

    r9036 r9049  
    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}
  • branches/BNC_2.12/src/RTCM3/RTCM3coDecoder.h

    r9037 r9049  
    3737 public:
    3838  enum e_type {RTCMssr, IGSssr};
    39   RTCM3coDecoder(const QString& staID, const e_type type);
     39  RTCM3coDecoder(const QString& staID);
    4040  virtual ~RTCM3coDecoder();
    4141  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
    42   virtual int   corrGPSEpochTime() const {return int(_lastTime.gpssec());}
     42  virtual int corrGPSEpochTime() const {return int(_lastTime.gpssec());}
     43  virtual void setSsrFormatType(const e_type type) {_type = type;}
    4344
    4445 signals:
     
    5758  void reopen();
    5859  void checkProviderID();
    59   std::string codeTypeToRnxType(char system, SsrCorr::CodeType type) const;
    6060
    6161  std::ofstream*                        _out;
Note: See TracChangeset for help on using the changeset viewer.