Changeset 6602 in ntrip

Timestamp:

Feb 20, 2015, 10:57:31 AM (9 years ago)

Author:

stuerze

Message:

some more renaming

Location:

trunk/BNC/src

Files:

• ephemeris.cpp (modified) (4 diffs)
• ephemeris.h (modified) (2 diffs)
• rinex/reqcedit.cpp (modified) (1 diff)

trunk/BNC/src/ephemeris.cpp

@@ -1525 +1525 @@
   }
 
-  static const double gmCompass    = 398.6004418e12;
-  static const double omegaCompass = 7292115.0000e-11;
+  static const double gmBDS    = 398.6004418e12;
+  static const double omegaBDS = 7292115.0000e-11;
 
   xc[0] = xc[1] = xc[2] = xc[3] = 0.0;
@@ -1538 +1538 @@
   double a0 = _sqrt_A * _sqrt_A;
 
-  double n0 = sqrt(gmCompass/(a0*a0*a0));
+  double n0 = sqrt(gmBDS/(a0*a0*a0));
   double tk = tt - _TOE;
   double n  = n0 + _Delta_n;
@@ -1575 +1575 @@
   // ------------------
   if (_i0 > iMaxGEO) {
-    double OM = _OMEGA0 + (_OMEGADOT - omegaCompass)*tk - omegaCompass*toesec;
+    double OM = _OMEGA0 + (_OMEGADOT - omegaBDS)*tk - omegaBDS*toesec;
 
     sinom = sin(OM);
@@ -1590 +1590 @@
   // -------------
   else {
-    double OM    = _OMEGA0 + _OMEGADOT*tk - omegaCompass*toesec;
-    double ll    = omegaCompass*tk;
+    double OM    = _OMEGA0 + _OMEGADOT*tk - omegaBDS*toesec;
+    double ll    = omegaBDS*tk;
 
     sinom = sin(OM);

trunk/BNC/src/ephemeris.h

@@ -19 +19 @@
 class t_eph {
  public:
-  enum e_type {unknown, GPS, QZSS, GLONASS, Galileo, SBAS, Compass};
+  enum e_type {unknown, GPS, QZSS, GLONASS, Galileo, SBAS, BDS};
   enum e_checkState {unchecked, ok, bad};
 
@@ -247 +247 @@
 
   void set(const bdsephemeris* ee);
-  virtual e_type  type() const {return t_eph::Compass;}
+  virtual e_type  type() const {return t_eph::BDS;}
   virtual int     IOD() const {return _AODC;}
   virtual QString toString(double version) const;

trunk/BNC/src/rinex/reqcedit.cpp

@@ -521 +521 @@
         ephs.append(new t_ephSBAS(*dynamic_cast<t_ephSBAS*>(eph)));
       }
-      else if (eph->type() == t_eph::Compass) {
+      else if (eph->type() == t_eph::BDS) {
         ephs.append(new t_ephBDS(*dynamic_cast<t_ephBDS*>(eph)));
       }