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

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.cpp (modified) (6 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -23 +23 @@
   _orbCorr    = 0;
   _clkCorr    = 0;
-  _flags      = 0;
 }
 
@@ -798 +797 @@
 //////////////////////////////////////////////////////////////////////////////
 t_ephGal::t_ephGal(float rnxVersion, const QStringList& lines) {
-
+  int       year, month, day, hour, min;
+  double    sec;
+  QString   prnStr;
   const int nLines = 8;
-
   if (lines.size() != nLines) {
     _checkState = bad;
     return;
   }
+  _flags = 0;
 
   // RINEX Format
@@ -826 +827 @@
       QTextStream in(line.left(pos[1]).toAscii());
 
-      int    year, month, day, hour, min;
-      double sec;
-      
-      QString prnStr;
       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
-      if (prnStr.at(0) == 'E') {
-        _prn.set('E', prnStr.mid(1).toInt());
-      }
-      else {
-        _prn.set('E', prnStr.toInt());
-      }
-
       if      (year <  80) {
         year += 2000;
@@ -936 +926 @@
         // Bit 7-8
         _E5bHS = double((int(SVhealth) >> 7) & 0x3);
+
+        if (prnStr.at(0) == 'E') {
+          _prn.set('E', prnStr.mid(1,2).toInt(), _flags);
+        }
+        else {
+          _prn.set('E', prnStr.mid(1,2).toInt(), _flags);
+        }
       }
     }
@@ -954 +951 @@
   _receptDateTime = currentDateAndTimeGPS();
 
-  _prn.set('E', ee->satellite);
+  _flags    = ee->flags;
+  _prn.set('E', ee->satellite, _flags);
 
   _TOC.set(ee->Week, ee->TOC);
@@ -994 +992 @@
 
   _TOT      = 0.9999e9;
-
-  _flags    = ee->flags;
 }