Changeset 5784 in ntrip


Ignore:
Timestamp:
Aug 4, 2014, 2:42:36 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/ppp.h

    r5780 r5784  
    7171class t_pppSatObs {
    7272 public:
    73   t_prn                 _prn;
    74   bncTime               _time;
    75   std::vector<t_pppObs> _obs;
     73  t_pppSatObs() {}
     74  ~t_pppSatObs() {for (unsigned ii = 0; ii < _obs.size(); ii++) delete _obs[ii];}
     75  t_prn                  _prn;
     76  bncTime                _time;
     77  std::vector<t_pppObs*> _obs;
    7678};
    7779
  • trunk/BNC/src/PPP/pppThread.cpp

    r5783 r5784  
    209209            pppObs                = new t_pppObs();
    210210            pppObsMap[rnxType2ch] = pppObs;
     211            pppObs->_rnxType2ch   = rnxType2ch;
     212            newObs->_obs.push_back(pppObs);
    211213          }
    212214          else {
     
    225227    }
    226228
    227     ////    pppSatObs.push_back(newObs);
     229    pppSatObs.push_back(newObs);
    228230  }
    229231
  • trunk/BNC/src/PPP/satobs.cpp

    r5780 r5784  
    6363  _outlier    = false;
    6464  for (unsigned ii = 0; ii < pppSatObs._obs.size(); ii++) {
    65     const t_pppObs& obs = pppSatObs._obs[ii];
    66     t_obsType obsType = string(obs._rnxType2ch).substr(0,2);
    67     _allObs[obsType] = new t_pppObs(obs);
     65    const t_pppObs* obs = pppSatObs._obs[ii];
     66    t_obsType obsType = string(obs->_rnxType2ch).substr(0,2);
     67    _allObs[obsType] = new t_pppObs(*obs);
    6868  }
    6969  prepareObs();
Note: See TracChangeset for help on using the changeset viewer.