Changeset 5832 in ntrip

Timestamp:

Aug 6, 2014, 2:54:09 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppThread.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppThread.cpp

@@ -198 +198 @@
     if (epoData != 0) {
       epoData->_satObs.push_back(newObs);
-      map<string, t_frqObs*> pppObsMap;
+      map<string, t_frqObs*> frqObsMap;
       for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {
         string hlp(oldObs.rnxStr(iEntry).toAscii().data());
@@ -205 +205 @@
           string rnxType2ch = hlp.substr(1);
           if (obsType == 'C' || obsType == 'L') {
-            t_frqObs* pppObs = 0;
-            if (pppObsMap.find(rnxType2ch) == pppObsMap.end()) {
-              pppObs                = new t_frqObs();
-              pppObsMap[rnxType2ch] = pppObs;
-              pppObs->_rnxType2ch   = rnxType2ch;
-              newObs->_obs.push_back(pppObs);
+            t_frqObs* frqObs = 0;
+            if (frqObsMap.find(rnxType2ch) == frqObsMap.end()) {
+              frqObs                = new t_frqObs();
+              frqObsMap[rnxType2ch] = frqObs;
+              frqObs->_rnxType2ch   = rnxType2ch;
+              newObs->_obs.push_back(frqObs);
             }
             else {
-              pppObs = pppObsMap[rnxType2ch];
+              frqObs = frqObsMap[rnxType2ch];
             }
             if      (obsType == 'C') {
-              pppObs->_code      = oldObs._measdata[iEntry];
-              pppObs->_codeValid = true;
+              frqObs->_code      = oldObs._measdata[iEntry];
+              frqObs->_codeValid = true;
             }
             else if (obsType == 'L') {
-              pppObs->_phase      = oldObs._measdata[iEntry];
-              pppObs->_phaseValid = true;
+              frqObs->_phase      = oldObs._measdata[iEntry];
+              frqObs->_phaseValid = true;
             }
           }