Changeset 5823 in ntrip


Ignore:
Timestamp:
Aug 6, 2014, 1:14:39 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppClient.cpp

    r5819 r5823  
    150150//
    151151//////////////////////////////////////////////////////////////////////////////
    152 t_irc t_pppClient::prepareObs(const vector<t_satObs*>& pppSatObs,
     152t_irc t_pppClient::prepareObs(const vector<t_satObs*>& satObs,
    153153                              vector<t_pppSatObs*>& obsVector, bncTime& epoTime) {
    154154  // Default
     
    159159  // -----------------------------------
    160160  int numValidGPS = 0;
    161   for (unsigned ii = 0; ii < pppSatObs.size(); ii++) {
    162     char system = pppSatObs[ii]->_prn.system();
     161  for (unsigned ii = 0; ii < satObs.size(); ii++) {
     162    char system = satObs[ii]->_prn.system();
    163163    if (system == 'G' || (system == 'R' && OPT->useGlonass())) {
    164       t_pppSatObs* satObs = new t_pppSatObs(*pppSatObs[ii]);
    165       if (satObs->isValid()) {
    166         obsVector.push_back(satObs);
    167         if (satObs->prn().system() == 'G') {
     164      t_pppSatObs* pppSatObs = new t_pppSatObs(*satObs[ii]);
     165      if (pppSatObs->isValid()) {
     166        obsVector.push_back(pppSatObs);
     167        if (pppSatObs->prn().system() == 'G') {
    168168          ++numValidGPS;
    169169        }
    170170      }
    171171      else {
    172         delete satObs;
     172        delete pppSatObs;
    173173      }
    174174    }
     
    402402//
    403403//////////////////////////////////////////////////////////////////////////////
    404 void t_pppClient::processEpoch(const vector<t_satObs*>& pppSatObs, t_output* output) {
     404void t_pppClient::processEpoch(const vector<t_satObs*>& satObs, t_output* output) {
    405405
    406406  try {
     
    409409    // Prepare Observations of the Rover
    410410    // ---------------------------------   
    411     if (prepareObs(pppSatObs, _obsRover, _epoTimeRover) != success) {
     411    if (prepareObs(satObs, _obsRover, _epoTimeRover) != success) {
    412412      return finish(failure);
    413413    }
  • trunk/BNC/src/PPP/pppClient.h

    r5819 r5823  
    2828  void putClkCorrections(const std::vector<t_clkCorr*>& corr);
    2929  void putBiases(const std::vector<t_satBiases*>& biases);   
    30   void processEpoch(const std::vector<t_satObs*>& pppSatObs, t_output* output);
     30  void processEpoch(const std::vector<t_satObs*>& satObs, t_output* output);
    3131
    3232  const t_pppEphPool* ephPool() const {return _ephPool;}
     
    4747  void finish(t_irc irc);
    4848  void clearObs();
    49   t_irc prepareObs(const std::vector<t_satObs*>& pppSatObs,
     49  t_irc prepareObs(const std::vector<t_satObs*>& satObs,
    5050                   std::vector<t_pppSatObs*>& obsVector, bncTime& epoTime);
    5151  t_irc cmpModel(t_pppStation* station, const ColumnVector& xyzc,
     
    5555  double cmpOffGG(std::vector<t_pppSatObs*>& obsVector);
    5656
    57   t_output*              _output;
     57  t_output*                 _output;
    5858  t_pppEphPool*             _ephPool;
    5959  t_frqObsPool*             _obsPool;
    60   bncTime                _epoTimeRover;
     60  bncTime                   _epoTimeRover;
    6161  t_pppStation*             _staRover;
    62   bncAntex*              _antex;
     62  bncAntex*                 _antex;
    6363  t_pppFilter*              _filter;
    64   double                 _offGG;
     64  double                    _offGG;
    6565  std::vector<t_pppSatObs*> _obsRover;
    66   std::ostringstream*    _log;
     66  std::ostringstream*       _log;
    6767  t_pppOptions*             _opt;
    68   t_tides*               _tides;
     68  t_tides*                  _tides;
    6969};
    7070
  • trunk/BNC/src/PPP/pppSatObs.h

    r5820 r5823  
    1616class t_pppSatObs {
    1717 public:
    18   t_pppSatObs(const t_satObs& pppSatObs);
     18  t_pppSatObs(const t_satObs& satObs);
    1919  ~t_pppSatObs();
    2020  bool                isValid() const {return _valid;}
  • trunk/BNC/src/PPP/pppThread.cpp

    r5819 r5823  
    197197    // --------------------------------------------------------------
    198198    if (epoData != 0) {
    199       epoData->_pppSatObs.push_back(newObs);
     199      epoData->_satObs.push_back(newObs);
    200200      map<string, t_frqObs*> pppObsMap;
    201201      for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {
     
    233233  if (_pppEpochs.size() > 1) {
    234234
    235     const vector<t_satObs*>& pppSatObs = _pppEpochs.front()->_pppSatObs;
     235    const vector<t_satObs*>& satObs = _pppEpochs.front()->_satObs;
    236236
    237237    t_output output;
    238     _pppClient->processEpoch(pppSatObs, &output);
     238    _pppClient->processEpoch(satObs, &output);
    239239
    240240    delete _pppEpochs.front(); _pppEpochs.pop_front();
  • trunk/BNC/src/PPP/pppThread.h

    r5819 r5823  
    3333    t_pppEpoData() {}
    3434    ~t_pppEpoData() {
    35       for (unsigned ii = 0; ii < _pppSatObs.size(); ii++) {
    36         delete _pppSatObs[ii];
     35      for (unsigned ii = 0; ii < _satObs.size(); ii++) {
     36        delete _satObs[ii];
    3737      }
    3838    }
    39     bncTime                   _time;
    40     std::vector<t_satObs*> _pppSatObs;
     39    bncTime                _time;
     40    std::vector<t_satObs*> _satObs;
    4141  };
    4242
Note: See TracChangeset for help on using the changeset viewer.