Changeset 7169 in ntrip


Ignore:
Timestamp:
Aug 5, 2015, 2:29:18 PM (9 years ago)
Author:
stuerze
Message:

harmonization of data type for SSR IOD

Location:
trunk/BNC/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/RTCM/RTCM2Decoder.cpp

    r7055 r7169  
    308308    vector<string> hasIOD;
    309309    for (unsigned ii = 0; ii < 4; ii++) {
    310       unsigned long IODcorr = 0;
     310      unsigned int IODcorr = 0;
    311311      double corrVal = 0;
    312312      const t_eph* eph = 0;

  • trunk/BNC/src/RTCM3/RTCM3coDecoder.h

    r7055 r7169  
    7171  int                                   _providerID[3];
    7272  bncTime                               _lastTime;
    73   QMap<t_prn, unsigned long>            _IODs;
     73  QMap<t_prn, unsigned int>             _IODs;
    7474  QMap<bncTime, QList<t_orbCorr> >      _orbCorrections;
    7575  QMap<bncTime, QList<t_clkCorr> >      _clkCorrections;

  • trunk/BNC/src/ephemeris.cpp

    r7140 r7169  
    651651// IOD of Glonass Ephemeris (virtual)
    652652////////////////////////////////////////////////////////////////////////////
    653 unsigned long t_ephGlo::IOD() const {
     653unsigned int t_ephGlo::IOD() const {
    654654  bncTime tMoscow = _TOC - _gps_utc + 3 * 3600.0;
    655655  return (unsigned long)tMoscow.daysec() / 900;
    … …  
    11421142////////////////////////////////////////////////////////////////////////////
    11431143
    1144 unsigned long t_ephSBAS::IOD() const {
     1144unsigned int t_ephSBAS::IOD() const {
    11451145  unsigned char buffer[80];
    11461146  int size = 0;
    … …  
    13731373// IOD of BDS Ephemeris (virtual)
    13741374////////////////////////////////////////////////////////////////////////////
    1375 unsigned long t_ephBDS::IOD() const {
     1375unsigned int t_ephBDS::IOD() const {
    13761376  unsigned char buffer[80];
    13771377  int size = 0;

  • trunk/BNC/src/ephemeris.h

    r7054 r7169  
    2525  virtual e_type  type() const = 0;
    2626  virtual QString toString(double version) const = 0;
    27   virtual unsigned long IOD() const = 0;
     27  virtual unsigned int IOD() const = 0;
    2828  virtual int     slotNum() const {return 0;}
    2929  bncTime TOC() const {return _TOC;}
    … …  
    6161  virtual e_type type() const {return (_prn.system() == 'J' ? t_eph::QZSS : t_eph::GPS); }
    6262  virtual QString toString(double version) const;
    63   virtual unsigned long  IOD() const { return static_cast<unsigned long>(_IODC); }
     63  virtual unsigned int  IOD() const { return static_cast<unsigned int>(_IODC); }
    6464  double TGD() const {return _TGD;} // Timing Group Delay (P1-P2 DCB)
    6565
    … …  
    115115  virtual e_type type() const {return t_eph::GLONASS;}
    116116  virtual QString toString(double version) const;
    117   virtual unsigned long  IOD() const;
     117  virtual unsigned int  IOD() const;
    118118  virtual int slotNum() const {return int(_frequency_number);}
    119119
    … …  
    156156  virtual QString toString(double version) const;
    157157  virtual e_type type() const {return t_eph::Galileo;}
    158   virtual unsigned long  IOD() const { return static_cast<unsigned long>(_IODnav); }
     158  virtual unsigned int  IOD() const { return static_cast<unsigned long>(_IODnav); }
    159159
    160160 private:
    … …  
    218218
    219219  virtual e_type  type() const {return t_eph::SBAS;}
    220   virtual unsigned long IOD() const;
     220  virtual unsigned int IOD() const;
    221221  virtual QString toString(double version) const;
    222222
    … …  
    254254
    255255  virtual e_type  type() const {return t_eph::BDS;}
    256   virtual unsigned long IOD() const;
     256  virtual unsigned int IOD() const;
    257257  virtual QString toString(double version) const;
    258258

  • trunk/BNC/src/pppRun.cpp

    r7055 r7169  
    436436    // ----------------
    437437    t_eph* eph = 0;
    438     const QMap<QString, unsigned long>* corrIODs = _corrFile ? &_corrFile->corrIODs() : 0;
     438    const QMap<QString, unsigned int>* corrIODs = _corrFile ? &_corrFile->corrIODs() : 0;
    439439    while ( (eph = _rnxNavFile->getNextEph(epo->tt, corrIODs)) != 0 ) {
    440440      _pppClient->putEphemeris(eph);

  • trunk/BNC/src/rinex/corrfile.h

    r7055 r7169  
    3939  ~t_corrFile();
    4040  void syncRead(const bncTime& tt);
    41   const QMap<QString, unsigned long>& corrIODs() const {return _corrIODs;}
     41  const QMap<QString, unsigned int>& corrIODs() const {return _corrIODs;}
    4242
    4343 signals:
    … …  
    4949
    5050 private:
    51   std::ifstream                _stream;
    52   std::string                  _lastLine;
    53   bncTime                      _lastEpoTime;
    54   QMap<QString, unsigned long> _corrIODs;
     51  std::ifstream               _stream;
     52  std::string                 _lastLine;
     53  bncTime                     _lastEpoTime;
     54  QMap<QString, unsigned int> _corrIODs;
    5555};
    5656

  • trunk/BNC/src/rinex/rnxnavfile.cpp

    r7055 r7169  
    212212////////////////////////////////////////////////////////////////////////////
    213213t_eph* t_rnxNavFile::getNextEph(const bncTime& tt,
    214                                 const QMap<QString, unsigned long>* corrIODs) {
     214                                const QMap<QString, unsigned int>* corrIODs) {
    215215
    216216  // Get Ephemeris according to IOD
    217217  // ------------------------------
    218218  if (corrIODs) {
    219     QMapIterator<QString, unsigned long> itIOD(*corrIODs);
     219    QMapIterator<QString, unsigned int> itIOD(*corrIODs);
    220220    while (itIOD.hasNext()) {
    221221      itIOD.next();
    222222      QString prn = itIOD.key();
    223       unsigned long iod = itIOD.value();
     223      unsigned int iod = itIOD.value();
    224224      vector<t_eph*>::iterator it = _ephs.begin();
    225225      while (it != _ephs.end()) {

  • trunk/BNC/src/rinex/rnxnavfile.h

    r7055 r7169  
    5555  t_rnxNavFile(const QString& fileName, e_inpOut inpOut);
    5656  ~t_rnxNavFile();
    57   t_eph* getNextEph(const bncTime& tt, const QMap<QString, unsigned long>* corrIODs);
     57  t_eph* getNextEph(const bncTime& tt, const QMap<QString, unsigned int>* corrIODs);
    5858  const std::vector<t_eph*> ephs() const {return _ephs;}
    5959  double version() const {return _header._version;}

  • trunk/BNC/src/satObs.h

    r7055 r7169  
    8787  std::string    _staID;
    8888  t_prn          _prn;
    89   unsigned long  _iod;
     89  unsigned int   _iod;
    9090  bncTime        _time;
    9191  unsigned int   _updateInt;
    … …  
    102102  std::string    _staID;
    103103  t_prn          _prn;
    104   unsigned long  _iod;
     104  unsigned int   _iod;
    105105  bncTime        _time;
    106106  unsigned int   _updateInt;

  • trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

    r7058 r7169  
    21012101  }
    21022102
    2103   outLine.sprintf("%d %.1f %s  %lu  %10.3f  %8.3f %8.3f %8.3f\n", GPSweek,
     2103  outLine.sprintf("%d %.1f %s  %u  %10.3f  %8.3f %8.3f %8.3f\n", GPSweek,
    21042104      GPSweeks, eph->prn().toString().c_str(), eph->IOD(), dClk, rsw(1), rsw(2),
    21052105      rsw(3));
Note: See TracChangeset for help on using the changeset viewer.