Changeset 4054 in ntrip

Timestamp:

Apr 26, 2012, 12:59:59 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/rinex

Files:

• reqcedit.cpp (modified) (1 diff)
• rnxobsfile.cpp (modified) (1 diff)

trunk/BNC/rinex/reqcedit.cpp

@@ -133 +133 @@
       editRnxObsHeader(outObsFile);
       outObsFile.writeHeader();
+    }
+    else {
+      outObsFile.checkNewHeader(obsFile->header());
     }
     t_rnxObsFile::t_rnxEpo* epo = 0;

trunk/BNC/rinex/rnxobsfile.cpp

@@ -1011 +1011 @@
   setHeader(header, oldHeader._version);
 
-  if (header._obsTypesV2 != oldHeader._obsTypesV2 ||
-      header._obsTypesV3 != oldHeader._obsTypesV3) {
-
+  // Check Observation Types
+  // -----------------------
+  bool same = true;
+  if (_header._version < 3.0) {
+    if (_header._obsTypesV2 != oldHeader._obsTypesV2) {
+      same = false;
+    }
+  }
+  else {
+    QMapIterator<char, QVector<QString> > it(_header._obsTypesV3);
+    while (it.hasNext()) {
+      it.next();
+      char                    sys     = it.key();
+      const QVector<QString>& typesV3 = it.value();
+      if (!oldHeader._obsTypesV3.contains(sys) ||
+          oldHeader._obsTypesV3[sys] != typesV3) {
+        same = false;
+        break;
+      }
+    }
+  }
+
+  if (!same) {
     writeHeader();
   }