Changeset 6259 in ntrip for trunk

Timestamp:

Oct 24, 2014, 4:55:00 PM (9 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -1119 +1119 @@
 void t_rnxObsFile::setObsFromRnx(const t_rnxObsFile* rnxObsFile, const t_rnxObsFile::t_rnxEpo* epo, 
                                  const t_rnxObsFile::t_rnxSat& rnxSat, t_satObs& obs) {
-
   obs._staID = rnxObsFile->markerName().toAscii().constData();
   obs._prn   = rnxSat.prn;
@@ -1126 +1125 @@
   char sys   = rnxSat.prn.system();
 
+  QChar addToL2;
   for (int iType = 0; iType < rnxObsFile->nTypes(sys); iType++) {
     QString type   = rnxObsFile->obsType(sys, iType);
     QString typeV3 = rnxObsFile->obsType(sys, iType, 3.0); // may or may not differ from type
+    if (rnxSat.obs.contains(type) && rnxSat.obs[type].value != 0.0) {
+      if (type == "P2" && typeV3.length() > 2) {
+        addToL2 = typeV3[2];
+        break;
+      }
+    }
+  }
+
+  for (int iType = 0; iType < rnxObsFile->nTypes(sys); iType++) {
+    QString type   = rnxObsFile->obsType(sys, iType);
+    QString typeV3 = rnxObsFile->obsType(sys, iType, 3.0); // may or may not differ from type
+    if (type == "L2") {
+      typeV3 += addToL2;
+    }
     if (rnxSat.obs.contains(type)) {
       const t_rnxObs& rnxObs = rnxSat.obs[type];