Changeset 4411 in ntrip for trunk/BNC/src/RTCM

Timestamp:

Jul 8, 2012, 3:15:57 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/RTCM/GPSDecoder.cpp (modified) (1 diff)

trunk/BNC/src/RTCM/GPSDecoder.cpp

@@ -114 +114 @@
 //////////////////////////////////////////////////////////////////////////////
 int t_obs::iEntry(const QString& rnxStr, float rnxVers, bool nonEmpty) const {
+
   if (rnxVers >= 3.0) {
     return iEntryV3(rnxStr);
   }
 
-  if      (rnxStr == "C1") return iEntryV3("C1C");
-  else if (rnxStr == "P1") return iEntryV3("C1P");
-  else if (rnxStr == "C2") return iEntryV3("C2C");
-  else if (rnxStr == "P2") return iEntryV3("C2P");
-
-  const QString chars = "PWCZI ";
-  for (int ii = 0; ii < chars.length(); ii++) {
-    QString hlpStr = rnxStr + chars[ii];
-    int ie = iEntryV3(hlpStr.trimmed());
-    if (ie != -1 && (!nonEmpty || _measdata[ie] != 0.0)) {
-      return ie;
+  if (satSys == 'G' || satSys == 'R') {
+    if      (rnxStr == "C1") return iEntryV3("C1C");
+    else if (rnxStr == "P1") return iEntryV3("C1P");
+    else if (rnxStr == "C2") return iEntryV3("C2C");
+    else if (rnxStr == "P2") return iEntryV3("C2P");
+    
+    const QString chars = "PWCZI ";
+    for (int ii = 0; ii < chars.length(); ii++) {
+      QString hlpStr = rnxStr + chars[ii];
+      int ie = iEntryV3(hlpStr.trimmed());
+      if (ie != -1 && (!nonEmpty || _measdata[ie] != 0.0)) {
+        return ie;
+      }
     }
+  }
+
+  else {
+    return iEntryV3(rnxStr);
   }