Changeset 6149 in ntrip

Timestamp:

Sep 13, 2014, 9:23:11 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (2 diffs)
• rinex/rnxobsfile.cpp (modified) (2 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -386 +386 @@
     }
     else {
-      _header._obsTypes['G'] << "C1C" << "L1C" << "D1C" << "S1C" 
-                             << "C1P" << "L1P" << "D1P" << "S1P" 
-                             << "C2C" << "L2C" << "D2C" << "S2C" 
-                             << "C2P" << "L2P" << "D2P" << "S2P" 
-                             << "C5"  << "D5"  << "L5"  << "S5";
+      _header._obsTypes['G'] << "C1C" << "L1C"  << "S1C" 
+                             << "C2W" << "L2W"  << "S2W" 
+                             << "C5"  << "L5"   << "S5";
       
-      _header._obsTypes['R'] << "C1C" << "L1C" << "D1C" << "S1C" 
-                             << "C1P" << "L1P" << "D1P" << "S1P" 
-                             << "C2C" << "L2C" << "D2C" << "S2C"
-                             << "C2P" << "L2P" << "D2P" << "S2P";
+      _header._obsTypes['J'] = _header._obsTypes['G'];
       
-      _header._obsTypes['E'] << "C1" << "L1" << "D1" << "S1"
-                             << "C5" << "L5" << "D5" << "S5" 
-                             << "C6" << "L6" << "D6" << "S6"
-                             << "C7" << "L7" << "D7" << "S7"
-                             << "C8" << "L8" << "D8" << "S8";
+      _header._obsTypes['R'] << "C1C" << "L1C" << "S1C" 
+                             << "C2P" << "L2P" << "S2P";
       
-      _header._obsTypes['J'] << "C1" << "L1" << "D1" << "S1" 
-                             << "C2" << "L2" << "D2" << "S2"
-                             << "C5" << "L5" << "D5" << "S5"
-                             << "C6" << "D6" << "L6" << "S6";
+      _header._obsTypes['E'] << "C1" << "L1" << "S1"
+                             << "C5" << "L5" << "S5" 
+                             << "C7" << "L7" << "S7"
+                             << "C8" << "L8" << "S8";
       
-      _header._obsTypes['S'] << "C1" << "L1" << "D1" << "S1" 
-                             << "C5" << "L5" << "D5" << "S5";
+      _header._obsTypes['S'] << "C1" << "L1" << "S1" 
+                             << "C5" << "L5" << "S5";
       
-      _header._obsTypes['C'] << "C1" << "L1" << "D1" << "S1"
-                             << "C6" << "L6" << "D6" << "S6"
-                             << "C7" << "L7" << "D7" << "S7";
+      _header._obsTypes['C'] << "C1" << "L1" << "S1"
+                             << "C6" << "L6" << "S6"
+                             << "C7" << "L7" << "S7";
     }
   }
@@ -613 +605 @@
     double  obsValue = 0.0;
     char    lli      = ' ';
-    QString rnxType = types[ii];
+    QString rnxType = t_rnxObsFile::type2to3(types[ii]);
     for (unsigned iFrq = 0; iFrq < obs._obs.size(); iFrq++) {
       const t_frqObs* frqObs = obs._obs[iFrq];
       for (int ik = 0; ik < obsKinds.length(); ik++) {
         QChar ch = obsKinds[ik];
-        QString obsType  = (ch + QString(frqObs->_rnxType2ch.c_str())).left(rnxType.length());
+        QString obsType = (ch + QString(frqObs->_rnxType2ch.c_str()));
+        obsType = t_rnxObsFile::type2to3(obsType).left(rnxType.length());
         if (rnxType == obsType) {
           if      (ch == 'L' && frqObs->_phaseValid) {

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -384 +384 @@
     }
     else if (int(version) == 3) {
-      return t_rnxObsFile::type2to3(sys, origType);
+      return t_rnxObsFile::type2to3(origType);
     }
   }
@@ -951 +951 @@
 // Translate Observation Type v2 --> v3
 ////////////////////////////////////////////////////////////////////////////
-QString t_rnxObsFile::type2to3(char /* sys */, const QString& typeV2) {
+QString t_rnxObsFile::type2to3(const QString& typeV2) {
   if      (typeV2 == "P1") {
     return "C1P";

trunk/BNC/src/rinex/rnxobsfile.h

@@ -165 +165 @@
                             t_satObs& obs);
 
-  static QString type2to3(char sys, const QString& typeV2);
+  static QString type2to3(const QString& typeV2);
   static QString type3to2(const QString& typeV3);