Changeset 5830 in ntrip for trunk/BNC/src/PPP/pppSatObs.cpp
- Timestamp:
- Aug 6, 2014, 2:43:05 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/PPP/pppSatObs.cpp
r5829 r5830 63 63 _outlier = false; 64 64 for (unsigned ii = 0; ii < pppSatObs._obs.size(); ii++) { 65 const t_frqObs* obs = pppSatObs._obs[ii]; 66 t_obsType obsType = string(obs->_rnxType2ch).substr(0,2); 67 _allObs[obsType] = new t_frqObs(*obs); 65 _allObs.push_back(new t_frqObs(*pppSatObs._obs[ii])); 68 66 } 69 67 prepareObs(); … … 73 71 //////////////////////////////////////////////////////////////////////////// 74 72 t_pppSatObs::~t_pppSatObs() { 75 map<t_obsType, t_frqObs*>::const_iterator it; 76 for (it = _allObs.begin(); it != _allObs.end(); it++) { 77 delete it->second; 73 for (unsigned ii = 0; ii < _allObs.size(); ii++) { 74 delete _allObs[ii]; 78 75 } 79 76 } … … 93 90 const string preferredAttrib = "CWP"; 94 91 for (unsigned iPref = 0; iPref < preferredAttrib.length(); iPref++) { 95 t_obsType obsType1 = "1?"; 96 obsType1[1] = preferredAttrib[iPref]; 97 if (_validObs1 == 0 && _allObs.find(obsType1) != _allObs.end()) { 98 t_frqObs* obs = _allObs[obsType1]; 99 if (obs->_codeValid && obs->_phaseValid) { 100 _validObs1 = obs; 92 string obsType1 = "1?"; obsType1[1] = preferredAttrib[iPref]; 93 if (_validObs1 == 0) { 94 for (unsigned ii = 0; ii < _allObs.size(); ii++) { 95 t_frqObs* obs = _allObs[ii]; 96 if (obs->_rnxType2ch == obsType1 && obs->_codeValid && obs->_phaseValid) { 97 _validObs1 = obs; 98 } 101 99 } 102 100 } 103 101 if (dualFreq) { 104 t_obsType obsType2 = "2?"; 105 obsType2[1] = preferredAttrib[iPref]; 106 if (_validObs2 == 0 && _allObs.find(obsType2) != _allObs.end()) { 107 t_frqObs* obs = _allObs[obsType2]; 108 if (obs->_codeValid && obs->_phaseValid) { 109 _validObs2 = obs; 102 string obsType2 = "2?"; obsType2[1] = preferredAttrib[iPref]; 103 if (_validObs2 == 0) { 104 for (unsigned ii = 0; ii < _allObs.size(); ii++) { 105 t_frqObs* obs = _allObs[ii]; 106 if (obs->_rnxType2ch == obsType2 && obs->_codeValid && obs->_phaseValid) { 107 _validObs2 = obs; 108 } 110 109 } 111 110 }
Note:
See TracChangeset
for help on using the changeset viewer.