Changeset 6880 in ntrip for trunk

Timestamp:

Jun 8, 2015, 9:38:19 AM (9 years ago)

Author:

stuerze

Message:

minor changes to read rinex nav files with blank space between satellite system and number

File:

• trunk/BNC/src/ephemeris.cpp (modified) (5 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -163 +163 @@
 
       QString prnStr;
-      in >> prnStr >> year >> month >> day >> hour >> min >> sec;
+      in >> prnStr;
+      if (prnStr.size() == 1) {
+        in >> prnStr;
+      }
+      in >> year >> month >> day >> hour >> min >> sec;
       if      (prnStr.at(0) == 'G') {
         _prn.set('G', prnStr.mid(1).toInt());
@@ -440 +444 @@
 
       QString prnStr;
-      in >> prnStr >> year >> month >> day >> hour >> min >> sec;
+      in >> prnStr;
+      if (prnStr.size() == 1) {
+        in >> prnStr;
+      }
+      in >> year >> month >> day >> hour >> min >> sec;
       if (prnStr.at(0) == 'R') {
         _prn.set('R', prnStr.mid(1).toInt());
@@ -673 +681 @@
     if      ( iLine == 0 ) {
       QTextStream in(line.left(pos[1]).toAscii());
-
-      in >> prnStr >> year >> month >> day >> hour >> min >> sec;
+      in >> prnStr;
+      if (prnStr.size() == 1) {
+        in >> prnStr;
+      }
+      in >> year >> month >> day >> hour >> min >> sec;
       if      (year <  80) {
         year += 2000;
@@ -1042 +1053 @@
       int    year, month, day, hour, min;
       double sec;
-      
+
       QString prnStr;
-      in >> prnStr >> year >> month >> day >> hour >> min >> sec;
+      in >> prnStr;
+      if (prnStr.size() == 1) {
+        in >> prnStr;
+      }
+      in >> year >> month >> day >> hour >> min >> sec;
       if (prnStr.at(0) == 'S') {
         _prn.set('S', prnStr.mid(1).toInt());
@@ -1204 +1219 @@
       int    year, month, day, hour, min;
       double sec;
-      
+
       QString prnStr;
-      in >> prnStr >> year >> month >> day >> hour >> min >> sec;
+      in >> prnStr;
+      if (prnStr.size() == 1) {
+        in >> prnStr;
+      }
+      in >> year >> month >> day >> hour >> min >> sec;
       if (prnStr.at(0) == 'C') {
         _prn.set('C', prnStr.mid(1).toInt());