Changeset 6465 in ntrip for trunk


Ignore:
Timestamp:
Dec 27, 2014, 6:04:02 PM (9 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/PPP/pppEphPool.cpp

    r6143 r6465  
    3838void t_pppEphPool::putOrbCorrection(t_orbCorr* corr) {
    3939  if (corr) {
    40     _satEphPool[corr->prn().toInt()].putOrbCorrection(corr);
     40    _satEphPool[corr->_prn.toInt()].putOrbCorrection(corr);
    4141  }
    4242}
    … …  
    4646void t_pppEphPool::putClkCorrection(t_clkCorr* corr) {
    4747  if (corr) {
    48     _satEphPool[corr->prn().toInt()].putClkCorrection(corr);
     48    _satEphPool[corr->_prn.toInt()].putClkCorrection(corr);
    4949  }
    5050}
    … …  
    8383  for (unsigned ii = 0; ii < _ephs.size(); ii++) {
    8484    t_eph* eph = _ephs[ii];
    85     if (eph->IOD() == corr->IOD()) {
     85    if (eph->IOD() == corr->_iod) {
    8686      eph->setOrbCorr(corr);
    8787      return;
    … …  
    9696  for (unsigned ii = 0; ii < _ephs.size(); ii++) {
    9797    t_eph* eph = _ephs[ii];
    98     if (eph->IOD() == corr->IOD()) {
     98    if (eph->IOD() == corr->_iod) {
    9999      eph->setClkCorr(corr);
    100100    }

  • trunk/BNC/src/pppInclude.h

    r6463 r6465  
    116116  virtual void putOrbCorrections(const std::vector<t_orbCorr*>& corr) = 0;
    117117  virtual void putClkCorrections(const std::vector<t_clkCorr*>& corr) = 0;
    118   virtual void putBiases(const std::vector<t_satCodeBias*>& satCodeBias) = 0;
     118  virtual void putCodeBiases(const std::vector<t_satCodeBias*>& satCodeBias) = 0;
    119119};   
    120120

  • trunk/BNC/src/satObs.cpp

    r6462 r6465  
    4444//
    4545////////////////////////////////////////////////////////////////////////////
    46 void t_clkCorr::readEpoch(std::istream* in, QList<t_clkCorr>& corrList) {
     46void t_clkCorr::readEpoch(const QStringList& lines, QList<t_clkCorr>& corrList) {
    4747}
    4848
    … …  
    8787//
    8888////////////////////////////////////////////////////////////////////////////
    89 void t_orbCorr::readEpoch(std::istream* in, QList<t_orbCorr>& corrList) {
     89void t_orbCorr::readEpoch(const QStringList& lines, QList<t_orbCorr>& corrList) {
    9090}

  • trunk/BNC/src/satObs.h

    r6463 r6465  
    6363  t_orbCorr() {reset();}
    6464  static void writeEpoch(std::ostream* out, const QList<t_orbCorr>& corrList);
    65   static void readEpoch(std::istream* in, QList<t_orbCorr>& corrList);
    66   void           reset();
    67   t_prn          prn() const {return _prn;}
    68   unsigned short IOD() const {return _iod;}
     65  static void readEpoch(const QStringList& lines, QList<t_orbCorr>& corrList);
     66  void reset();
    6967  std::string    _staID;
    7068  t_prn          _prn;
    … …  
    8078  t_clkCorr() {reset();}
    8179  static void writeEpoch(std::ostream* out, const QList<t_clkCorr>& corrList);
    82   static void readEpoch(std::istream* in, QList<t_clkCorr>& corrList);
    83   void           reset();
    84   t_prn          prn() const {return _prn;}
    85   unsigned short IOD() const {return _iod;}
     80  static void readEpoch(const QStringList& lines, QList<t_clkCorr>& corrList);
     81  void reset();
    8682  std::string    _staID;
    8783  t_prn          _prn;
Note: See TracChangeset for help on using the changeset viewer.