Changeset 4540 in ntrip

Timestamp:

Aug 21, 2012, 5:58:48 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• rnxobsfile.cpp (modified) (4 diffs)
• rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -490 +490 @@
 // Handle Special Epoch Flag
 ////////////////////////////////////////////////////////////////////////////
-void t_rnxObsFile::handleEpochFlag(int flag, const QString& line) {
+void t_rnxObsFile::handleEpochFlag(int flag, const QString& line, 
+                                   bool& headerReRead) {
+
+  headerReRead = false;
 
   // Power Failure
@@ -515 +518 @@
     }
     _header.read(_stream, numLines);
+    headerReRead = true;
   }
 
@@ -553 +557 @@
     readInt(line, 31, 1, flag);
     if (flag > 0) {
-      handleEpochFlag(flag, line);
-      continue;
+      bool headerReRead = false;
+      handleEpochFlag(flag, line, headerReRead);
+      if (headerReRead) {
+        continue;
+      }
     }
 
@@ -622 +629 @@
     readInt(line, 28, 1, flag);
     if (flag > 0) {
-      handleEpochFlag(flag, line);
-      continue;
+      bool headerReRead = false;
+      handleEpochFlag(flag, line, headerReRead);
+      if (headerReRead) {
+        continue;
+      }
     }
 

trunk/BNC/src/rinex/rnxobsfile.h

@@ -153 +153 @@
   t_rnxEpo* nextEpochV2();
   t_rnxEpo* nextEpochV3();
-  void handleEpochFlag(int flag, const QString& line);
+  void handleEpochFlag(int flag, const QString& line, bool& headerReRead);
 
   QString type2to3(char sys, const QString& typeV2);