Changeset 6602 in ntrip


Ignore:
Timestamp:
Feb 20, 2015, 10:57:31 AM (7 years ago)
Author:
stuerze
Message:

some more renaming

Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/ephemeris.cpp

    r6601 r6602  
    15251525  }
    15261526
    1527   static const double gmCompass    = 398.6004418e12;
    1528   static const double omegaCompass = 7292115.0000e-11;
     1527  static const double gmBDS    = 398.6004418e12;
     1528  static const double omegaBDS = 7292115.0000e-11;
    15291529
    15301530  xc[0] = xc[1] = xc[2] = xc[3] = 0.0;
     
    15381538  double a0 = _sqrt_A * _sqrt_A;
    15391539
    1540   double n0 = sqrt(gmCompass/(a0*a0*a0));
     1540  double n0 = sqrt(gmBDS/(a0*a0*a0));
    15411541  double tk = tt - _TOE;
    15421542  double n  = n0 + _Delta_n;
     
    15751575  // ------------------
    15761576  if (_i0 > iMaxGEO) {
    1577     double OM = _OMEGA0 + (_OMEGADOT - omegaCompass)*tk - omegaCompass*toesec;
     1577    double OM = _OMEGA0 + (_OMEGADOT - omegaBDS)*tk - omegaBDS*toesec;
    15781578
    15791579    sinom = sin(OM);
     
    15901590  // -------------
    15911591  else {
    1592     double OM    = _OMEGA0 + _OMEGADOT*tk - omegaCompass*toesec;
    1593     double ll    = omegaCompass*tk;
     1592    double OM    = _OMEGA0 + _OMEGADOT*tk - omegaBDS*toesec;
     1593    double ll    = omegaBDS*tk;
    15941594
    15951595    sinom = sin(OM);
  • trunk/BNC/src/ephemeris.h

    r6600 r6602  
    1919class t_eph {
    2020 public:
    21   enum e_type {unknown, GPS, QZSS, GLONASS, Galileo, SBAS, Compass};
     21  enum e_type {unknown, GPS, QZSS, GLONASS, Galileo, SBAS, BDS};
    2222  enum e_checkState {unchecked, ok, bad};
    2323
     
    247247
    248248  void set(const bdsephemeris* ee);
    249   virtual e_type  type() const {return t_eph::Compass;}
     249  virtual e_type  type() const {return t_eph::BDS;}
    250250  virtual int     IOD() const {return _AODC;}
    251251  virtual QString toString(double version) const;
  • trunk/BNC/src/rinex/reqcedit.cpp

    r6600 r6602  
    521521        ephs.append(new t_ephSBAS(*dynamic_cast<t_ephSBAS*>(eph)));
    522522      }
    523       else if (eph->type() == t_eph::Compass) {
     523      else if (eph->type() == t_eph::BDS) {
    524524        ephs.append(new t_ephBDS(*dynamic_cast<t_ephBDS*>(eph)));
    525525      }
Note: See TracChangeset for help on using the changeset viewer.