Index: trunk/BNC/src/RTCM3/ephEncoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 5852)
+++ trunk/BNC/src/RTCM3/ephEncoder.cpp	(revision 5853)
@@ -174,34 +174,34 @@
 
   GLONASSADDBITS(12, 1020)
-  GLONASSADDBITS(6, _prn.number())
-  GLONASSADDBITS(5, 7+_frequency_number)
+  GLONASSADDBITS(6, eph._prn.number())
+  GLONASSADDBITS(5, 7+eph._frequency_number)
   GLONASSADDBITS(1, 0)
   GLONASSADDBITS(1, 0)
   GLONASSADDBITS(2, 0)
-  _tki=_tki+3*60*60;
-  GLONASSADDBITS(5, static_cast<int>(_tki)/(60*60))
-  GLONASSADDBITS(6, (static_cast<int>(_tki)/60)%60)
-  GLONASSADDBITS(1, (static_cast<int>(_tki)/30)%30)
-  GLONASSADDBITS(1, _health) 
+  eph._tki=eph._tki+3*60*60;
+  GLONASSADDBITS(5, static_cast<int>(eph._tki)/(60*60))
+  GLONASSADDBITS(6, (static_cast<int>(eph._tki)/60)%60)
+  GLONASSADDBITS(1, (static_cast<int>(eph._tki)/30)%30)
+  GLONASSADDBITS(1, eph._health) 
   GLONASSADDBITS(1, 0)
-  unsigned long long timeofday = (static_cast<int>(_tt.gpssec()+3*60*60-_gps_utc)%86400);
+  unsigned long long timeofday = (static_cast<int>(eph._tt.gpssec()+3*60*60-eph._gps_utc)%86400);
   GLONASSADDBITS(7, timeofday/60/15)
-  GLONASSADDBITSFLOATM(24, _x_velocity*1000, 1000.0/static_cast<double>(1<<20))
-  GLONASSADDBITSFLOATM(27, _x_pos*1000, 1000.0/static_cast<double>(1<<11))
-  GLONASSADDBITSFLOATM(5, _x_acceleration*1000, 1000.0/static_cast<double>(1<<30))
-  GLONASSADDBITSFLOATM(24, _y_velocity*1000, 1000.0/static_cast<double>(1<<20))
-  GLONASSADDBITSFLOATM(27, _y_pos*1000, 1000.0/static_cast<double>(1<<11))
-  GLONASSADDBITSFLOATM(5, _y_acceleration*1000, 1000.0/static_cast<double>(1<<30))
-  GLONASSADDBITSFLOATM(24, _z_velocity*1000, 1000.0/static_cast<double>(1<<20))
-  GLONASSADDBITSFLOATM(27,_z_pos*1000, 1000.0/static_cast<double>(1<<11))
-  GLONASSADDBITSFLOATM(5, _z_acceleration*1000, 1000.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(24, eph._x_velocity*1000, 1000.0/static_cast<double>(1<<20))
+  GLONASSADDBITSFLOATM(27, eph._x_pos*1000, 1000.0/static_cast<double>(1<<11))
+  GLONASSADDBITSFLOATM(5, eph._x_acceleration*1000, 1000.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(24, eph._y_velocity*1000, 1000.0/static_cast<double>(1<<20))
+  GLONASSADDBITSFLOATM(27, eph._y_pos*1000, 1000.0/static_cast<double>(1<<11))
+  GLONASSADDBITSFLOATM(5, eph._y_acceleration*1000, 1000.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(24, eph._z_velocity*1000, 1000.0/static_cast<double>(1<<20))
+  GLONASSADDBITSFLOATM(27,eph._z_pos*1000, 1000.0/static_cast<double>(1<<11))
+  GLONASSADDBITSFLOATM(5, eph._z_acceleration*1000, 1000.0/static_cast<double>(1<<30))
   GLONASSADDBITS(1, 0)
-  GLONASSADDBITSFLOATM(11, _gamma, 1.0/static_cast<double>(1<<30)
+  GLONASSADDBITSFLOATM(11, eph._gamma, 1.0/static_cast<double>(1<<30)
   /static_cast<double>(1<<10))
   GLONASSADDBITS(2, 0) /* GLONASS-M P */
   GLONASSADDBITS(1, 0) /* GLONASS-M ln(3) */
-  GLONASSADDBITSFLOATM(22, _tau, 1.0/static_cast<double>(1<<30))
+  GLONASSADDBITSFLOATM(22, eph._tau, 1.0/static_cast<double>(1<<30))
   GLONASSADDBITS(5, 0) /* GLONASS-M delta tau */
-  GLONASSADDBITS(5, _E)
+  GLONASSADDBITS(5, eph._E)
   GLONASSADDBITS(1, 0) /* GLONASS-M P4 */
   GLONASSADDBITS(4, 0) /* GLONASS-M FT */
@@ -246,55 +246,55 @@
   buffer= buffer+3;
 
-  bool inav = ( (_flags & GALEPHF_INAV) == GALEPHF_INAV );
+  bool inav = ( (eph._flags & GALEPHF_INAV) == GALEPHF_INAV );
 
   GALILEOADDBITS(12, inav ? 1046 : 1045)
-  GALILEOADDBITS(6, _prn.number())
-  GALILEOADDBITS(12, _TOC.gpsw())
-  GALILEOADDBITS(10, _IODnav)
-  GALILEOADDBITS(8, _SISA)
-  GALILEOADDBITSFLOAT(14, _IDOT, M_PI/static_cast<double>(1<<30)
-  /static_cast<double>(1<<13))
-  GALILEOADDBITS(14, _TOC.gpssec()/60)
-  GALILEOADDBITSFLOAT(6, _clock_driftrate, 1.0/static_cast<double>(1<<30)
+  GALILEOADDBITS(6, eph._prn.number())
+  GALILEOADDBITS(12, eph._TOC.gpsw())
+  GALILEOADDBITS(10, eph._IODnav)
+  GALILEOADDBITS(8, eph._SISA)
+  GALILEOADDBITSFLOAT(14, eph._IDOT, M_PI/static_cast<double>(1<<30)
+  /static_cast<double>(1<<13))
+  GALILEOADDBITS(14, eph._TOC.gpssec()/60)
+  GALILEOADDBITSFLOAT(6, eph._clock_driftrate, 1.0/static_cast<double>(1<<30)
   /static_cast<double>(1<<29))
-  GALILEOADDBITSFLOAT(21, _clock_drift, 1.0/static_cast<double>(1<<30)
+  GALILEOADDBITSFLOAT(21, eph._clock_drift, 1.0/static_cast<double>(1<<30)
   /static_cast<double>(1<<16))
-  GALILEOADDBITSFLOAT(31, _clock_bias, 1.0/static_cast<double>(1<<30)
+  GALILEOADDBITSFLOAT(31, eph._clock_bias, 1.0/static_cast<double>(1<<30)
   /static_cast<double>(1<<4))
-  GALILEOADDBITSFLOAT(16, _Crs, 1.0/static_cast<double>(1<<5))
-  GALILEOADDBITSFLOAT(16, _Delta_n, M_PI/static_cast<double>(1<<30)
-  /static_cast<double>(1<<13))
-  GALILEOADDBITSFLOAT(32, _M0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
-  GALILEOADDBITSFLOAT(16, _Cuc, 1.0/static_cast<double>(1<<29))
-  GALILEOADDBITSFLOAT(32, _e, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<3))
-  GALILEOADDBITSFLOAT(16, _Cus, 1.0/static_cast<double>(1<<29))
-  GALILEOADDBITSFLOAT(32, _sqrt_A, 1.0/static_cast<double>(1<<19))
-  GALILEOADDBITS(14, _TOEsec/60)
-  GALILEOADDBITSFLOAT(16, _Cic, 1.0/static_cast<double>(1<<29))
-  GALILEOADDBITSFLOAT(32, _OMEGA0, M_PI/static_cast<double>(1<<30)
-  /static_cast<double>(1<<1))
-  GALILEOADDBITSFLOAT(16, _Cis, 1.0/static_cast<double>(1<<29))
-  GALILEOADDBITSFLOAT(32, _i0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
-  GALILEOADDBITSFLOAT(16, _Crc, 1.0/static_cast<double>(1<<5))
-  GALILEOADDBITSFLOAT(32, _omega, M_PI/static_cast<double>(1<<30)
-  /static_cast<double>(1<<1))
-  GALILEOADDBITSFLOAT(24, _OMEGADOT, M_PI/static_cast<double>(1<<30)
-  /static_cast<double>(1<<13))
-  GALILEOADDBITSFLOAT(10, _BGD_1_5A, 1.0/static_cast<double>(1<<30)
+  GALILEOADDBITSFLOAT(16, eph._Crs, 1.0/static_cast<double>(1<<5))
+  GALILEOADDBITSFLOAT(16, eph._Delta_n, M_PI/static_cast<double>(1<<30)
+  /static_cast<double>(1<<13))
+  GALILEOADDBITSFLOAT(32, eph._M0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
+  GALILEOADDBITSFLOAT(16, eph._Cuc, 1.0/static_cast<double>(1<<29))
+  GALILEOADDBITSFLOAT(32, eph._e, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<3))
+  GALILEOADDBITSFLOAT(16, eph._Cus, 1.0/static_cast<double>(1<<29))
+  GALILEOADDBITSFLOAT(32, eph._sqrt_A, 1.0/static_cast<double>(1<<19))
+  GALILEOADDBITS(14, eph._TOEsec/60)
+  GALILEOADDBITSFLOAT(16, eph._Cic, 1.0/static_cast<double>(1<<29))
+  GALILEOADDBITSFLOAT(32, eph._OMEGA0, M_PI/static_cast<double>(1<<30)
+  /static_cast<double>(1<<1))
+  GALILEOADDBITSFLOAT(16, eph._Cis, 1.0/static_cast<double>(1<<29))
+  GALILEOADDBITSFLOAT(32, eph._i0, M_PI/static_cast<double>(1<<30)/static_cast<double>(1<<1))
+  GALILEOADDBITSFLOAT(16, eph._Crc, 1.0/static_cast<double>(1<<5))
+  GALILEOADDBITSFLOAT(32, eph._omega, M_PI/static_cast<double>(1<<30)
+  /static_cast<double>(1<<1))
+  GALILEOADDBITSFLOAT(24, eph._OMEGADOT, M_PI/static_cast<double>(1<<30)
+  /static_cast<double>(1<<13))
+  GALILEOADDBITSFLOAT(10, eph._BGD_1_5A, 1.0/static_cast<double>(1<<30)
   /static_cast<double>(1<<2))
   if(inav)
   {
-    GALILEOADDBITSFLOAT(10, _BGD_1_5B, 1.0/static_cast<double>(1<<30)
+    GALILEOADDBITSFLOAT(10, eph._BGD_1_5B, 1.0/static_cast<double>(1<<30)
     /static_cast<double>(1<<2))
-    GALILEOADDBITS(2, static_cast<int>(_E5bHS))
-    GALILEOADDBITS(1, _flags & GALEPHF_E5BDINVALID)
+    GALILEOADDBITS(2, static_cast<int>(eph._E5bHS))
+    GALILEOADDBITS(1, eph._flags & GALEPHF_E5BDINVALID)
   }
   else
   {
-    GALILEOADDBITS(2, static_cast<int>(_E5aHS))
-    GALILEOADDBITS(1, _flags & GALEPHF_E5ADINVALID)
-  }
-  _TOEsec = 0.9999E9;
-  GALILEOADDBITS(20, _TOEsec)
+    GALILEOADDBITS(2, static_cast<int>(eph._E5aHS))
+    GALILEOADDBITS(1, eph._flags & GALEPHF_E5ADINVALID)
+  }
+  ////  eph._TOEsec = 0.9999E9;
+  GALILEOADDBITS(20, eph._TOEsec)
 
   GALILEOADDBITS(inav ? 1 : 3, 0)