Changeset 5784 in ntrip

Timestamp:

Aug 4, 2014, 2:42:36 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• ppp.h (modified) (1 diff)
• pppThread.cpp (modified) (2 diffs)
• satobs.cpp (modified) (1 diff)

trunk/BNC/src/PPP/ppp.h

@@ -71 +71 @@
 class t_pppSatObs {
  public:
-  t_prn                 _prn;
-  bncTime               _time;
-  std::vector<t_pppObs> _obs;
+  t_pppSatObs() {}
+  ~t_pppSatObs() {for (unsigned ii = 0; ii < _obs.size(); ii++) delete _obs[ii];}
+  t_prn                  _prn;
+  bncTime                _time;
+  std::vector<t_pppObs*> _obs;
 };
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -209 +209 @@
             pppObs                = new t_pppObs();
             pppObsMap[rnxType2ch] = pppObs;
+            pppObs->_rnxType2ch   = rnxType2ch;
+            newObs->_obs.push_back(pppObs);
           }
           else {
@@ -225 +227 @@
     }
 
-    ////    pppSatObs.push_back(newObs);
+    pppSatObs.push_back(newObs);
   }
 

trunk/BNC/src/PPP/satobs.cpp

@@ -63 +63 @@
   _outlier    = false;
   for (unsigned ii = 0; ii < pppSatObs._obs.size(); ii++) {
-    const t_pppObs& obs = pppSatObs._obs[ii];
-    t_obsType obsType = string(obs._rnxType2ch).substr(0,2);
-    _allObs[obsType] = new t_pppObs(obs);
+    const t_pppObs* obs = pppSatObs._obs[ii];
+    t_obsType obsType = string(obs->_rnxType2ch).substr(0,2);
+    _allObs[obsType] = new t_pppObs(*obs);
   }
   prepareObs();