Changeset 5889 in ntrip


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

Legend:

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

    r5883 r5889  
    9292  }
    9393  else {
     94    _rnxObsFile = 0;
     95    _rnxNavFile = 0;
     96    _corrFile   = 0;
     97    _maxSpeed   = 0;
     98    _speed      = 0;
    9499    processFiles();
    95100  }
     
    343348
    344349  try {
    345     _rnxObsFile = new t_rnxObsFile(_opt->obsFileName, t_rnxObsFile::input);
     350    _rnxObsFile = new t_rnxObsFile(QString(_opt->_rinexObs.c_str()), t_rnxObsFile::input);
    346351  }
    347352  catch (...) {
     
    351356  }
    352357
    353   _rnxNavFile = new t_rnxNavFile(_opt->navFileName, t_rnxNavFile::input);
    354   _pppClient  = new bncPPPclient("POST", _opt, false);
    355 
    356   if (!_opt->corrFileName.isEmpty()) {
    357     _corrFile = new t_corrFile(_opt->corrFileName);
     358  _rnxNavFile = new t_rnxNavFile(QString(_opt->_rinexNav.c_str()), t_rnxNavFile::input);
     359
     360  if (!_opt->_corrFile.empty()) {
     361    _corrFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
    358362    connect(_corrFile, SIGNAL(newCorrections(QStringList)),
    359             _pppClient, SLOT(slotNewCorrections(QStringList)));
     363            this, SLOT(slotNewCorrections(QStringList)));
    360364  }
    361365
     
    371375      if (_speed < _maxSpeed) {
    372376        double sleepTime = 0.02 * _maxSpeed / _speed;
    373         msleep(sleepTime*1.e3);
     377        //// msleep(sleepTime*1.e3);
    374378      }
    375379    }
     
    386390    const QMap<QString, int>* corrIODs = _corrFile ? &_corrFile->corrIODs() : 0;
    387391    while ( (eph = _rnxNavFile->getNextEph(epo->tt, corrIODs)) != 0 ) {
    388       if (_pppClient->putNewEph(eph) != success) {
    389         delete eph; eph = 0;
    390       }
     392      _pppClient->putEphemeris(eph);
     393      delete eph; eph = 0;
    391394    }
    392395
    393396    for (unsigned iObs = 0; iObs < epo->rnxSat.size(); iObs++) {
    394 
    395       if (_isToBeDeleted) {
    396         QThread::exit(0);
    397         return;
    398       }
    399 
    400397      const t_rnxObsFile::t_rnxSat& rnxSat = epo->rnxSat[iObs];
    401398   
  • trunk/BNC/src/PPP/pppRun.h

    r5883 r5889  
    2828  void newPosition(bncTime time, QVector<double> xx);
    2929  void newNMEAstr(QByteArray str);
     30  void progress(int);
     31  void finished();
    3032
    3133 public slots:
     
    3537  void slotNewCorrections(QStringList corrList);
    3638  void slotNewObs(QByteArray staID, QList<t_obs> obsList);
     39  void slotSetSpeed(int speed);
    3740
    3841 private:
Note: See TracChangeset for help on using the changeset viewer.