Changeset 6193 in ntrip for trunk

Timestamp:

Sep 14, 2014, 5:03:05 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/rnxobsfile.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -951 +951 @@
 // Translate Observation Type v2 --> v3
 ////////////////////////////////////////////////////////////////////////////
-QString t_rnxObsFile::type2to3(char /* sys */, const QString& typeV2) {
+QString t_rnxObsFile::type2to3(char sys, const QString& typeV2) {
   if      (typeV2 == "P1") {
-    return "C1P";
+    return (sys == 'G') ? "C1W" : "C1P";
   }
   else if (typeV2 == "P2") {
-    return "C2P";
+    return (sys == 'G') ? "C2W" : "C2P";
   }
   return typeV2;
@@ -964 +964 @@
 ////////////////////////////////////////////////////////////////////////////
 QString t_rnxObsFile::type3to2(char /* sys */, const QString& typeV3) {
-  if      (typeV3 == "C1P") {
+  if      (typeV3 == "C1P" || typeV3 == "C1W") {
     return "P1";
   }
-  else if (typeV3 == "C2P") {
+  else if (typeV3 == "C2P" || typeV3 == "C2W") {
     return "P2";
   }