Changeset 6809 in ntrip for trunk/BNC/src/ephemeris.h

Timestamp:

Apr 30, 2015, 10:37:30 PM (9 years ago)

Author:

stuerze

Message:

I/NAV - F/NAV issue (hopefully:) solved in another way

File:

• trunk/BNC/src/ephemeris.h (modified) (6 diffs)

trunk/BNC/src/ephemeris.h

@@ -34 +34 @@
   void    setCheckState(e_checkState checkState) {_checkState = checkState;}
   t_prn   prn() const {return _prn;}
-  int     flags() const {return _flags;}
-  bool    hasOtherFlagsThan(const t_eph* eph) {return differentFlags(eph, this);}
   t_irc   getCrd(const bncTime& tt, ColumnVector& xc, ColumnVector& vv, bool useCorr) const;
   void    setOrbCorr(const t_orbCorr* orbCorr);
@@ -43 +41 @@
   static QString rinexDateStr(const bncTime& tt, const QString& prnStr, double version);
   static bool earlierTime(const t_eph* eph1, const t_eph* eph2) {return eph1->_TOC < eph2->_TOC;}
-  static bool differentFlags(const t_eph* eph1, const t_eph* eph2) {return eph1->_flags != eph2->_flags;}
 
  protected:  
@@ -49 +46 @@
   t_prn        _prn;
   bncTime      _TOC;
-  int          _flags;
   QDateTime    _receptDateTime;
   e_checkState _checkState;
@@ -155 +151 @@
  friend class t_ephEncoder;
  public:
-  t_ephGal() { }
+  t_ephGal() : _flags(0) { };
   t_ephGal(float rnxVersion, const QStringList& lines);
   virtual ~t_ephGal() {}
@@ -192 +188 @@
 
   double  _IDOT;             //  [rad/s]
-  double _TOEweek;
+  double  _TOEweek;
   // spare
 
@@ -202 +198 @@
   double  _BGD_1_5B;         //  group delay [s] 
 
-  double _TOT;               // [s]
+  double  _TOT;              // [s]
+
+  int     _flags;            // GALEPHF_E5ADINVALID   E5aDVS set invalid
+                             // GALEPHF_E5BDINVALID   E5bDVS set invalid
+                             // GALEPHF_INAV          INAV data
+                             // GALEPHF_FNAV          FNAV data
+                             // GALEPHF_E1DINVALID    E1DVS set invalid
 };