Changeset 886 in ntrip for trunk/BNS/bnseph.h

Timestamp:

May 8, 2008, 4:47:15 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNS/bnseph.h (modified) (5 diffs)

trunk/BNS/bnseph.h

@@ -12 +12 @@
  public:
   virtual ~t_eph() {};
+
+  bool    isNewerThan(const t_eph* eph) const;
+  QString prn() const {return _prn;}
+
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const = 0;
   virtual void read(const QStringList& lines) = 0;
-  virtual bool isNewerThan(const t_eph* ep) const = 0;
   virtual int  IOD() const = 0;
-  QString prn() const {return _prn;}
  protected:  
   QString _prn;
+  int     _GPSweek;
+  double  _GPSweeks;
 };
 
@@ -31 +35 @@
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const;
-  virtual bool isNewerThan(const t_eph* ep) const;
   virtual int  IOD() const;
  private:
@@ -37 +40 @@
   ColumnVector _xv;
 
-  double _GPSweek;
-  double _GPSTOW;
   double _E;                  /* [days]   */
   double _tau;                /* [s]      */
@@ -51 +52 @@
   double _z_velocity;         /* [km/s]   */
   double _z_acceleration;     /* [km/s^2] */
-  int    _flags;              /* GLOEPHF_xxx */
-  int    _frequency_number;   /* ICD-GLONASS data position */
+  double _health;             /* 0 = O.K. */
+  double _frequency_number;   /* ICD-GLONASS data position */
 };
 
@@ -67 +68 @@
 
  private:
-  double  _GPSweek;          
   double  _TOW;              //  [s]    
   double  _TOC;              //  [s]