Changeset 5780 in ntrip for trunk/BNC/src/PPP/satobs.cpp

Timestamp:

Aug 4, 2014, 1:55:27 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/satobs.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/satobs.cpp

@@ -63 +63 @@
   _outlier    = false;
   for (unsigned ii = 0; ii < pppSatObs._obs.size(); ii++) {
-    const t_obs& obs = pppSatObs._obs[ii];
+    const t_pppObs& obs = pppSatObs._obs[ii];
     t_obsType obsType = string(obs._rnxType2ch).substr(0,2);
-    _allObs[obsType] = new t_obs(obs);
+    _allObs[obsType] = new t_pppObs(obs);
   }
   prepareObs();
@@ -73 +73 @@
 ////////////////////////////////////////////////////////////////////////////
 t_satObs::~t_satObs() {
-  map<t_obsType, t_obs*>::const_iterator it;
+  map<t_obsType, t_pppObs*>::const_iterator it;
   for (it = _allObs.begin(); it != _allObs.end(); it++) {
     delete it->second;
@@ -96 +96 @@
     obsType1[1] = preferredAttrib[iPref];
     if (_validObs1 == 0 && _allObs.find(obsType1) != _allObs.end()) {
-      t_obs* obs = _allObs[obsType1];
+      t_pppObs* obs = _allObs[obsType1];
       if (obs->_codeValid && obs->_phaseValid) {
         _validObs1 = obs;
@@ -105 +105 @@
       obsType2[1] = preferredAttrib[iPref];
       if (_validObs2 == 0 && _allObs.find(obsType2) != _allObs.end()) {
-        t_obs* obs = _allObs[obsType2];
+        t_pppObs* obs = _allObs[obsType2];
         if (obs->_codeValid && obs->_phaseValid) {
           _validObs2 = obs;