Changeset 5936 in ntrip
- Timestamp:
- Aug 15, 2014, 11:21:26 AM (10 years ago)
- Location:
- trunk/BNC/src/PPP
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/PPP/pppRun.cpp
r5934 r5936 176 176 map<string, t_frqObs*> frqObsMap; 177 177 for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) { 178 179 QString rnxStr = oldObs.rnxStr(iEntry); 180 if (rnxStr.length() == 2) { 181 rnxStr = t_rnxObsFile::type2to3(oldObs.satSys, rnxStr); 182 } 183 string hlp = rnxStr.toAscii().data(); 184 178 string hlp = oldObs.rnxStr(iEntry).toAscii().data(); 185 179 if (hlp.length() >= 2 && oldObs._measdata[iEntry] != 0.0) { 186 180 char obsType = hlp[0]; -
trunk/BNC/src/PPP/pppSatObs.cpp
r5935 r5936 88 88 // Select two pseudoranges and two phase observations 89 89 // -------------------------------------------------- 90 const string preferredAttrib = "CWP ?";90 const string preferredAttrib = "CWP_"; 91 91 for (unsigned iPref = 0; iPref < preferredAttrib.length(); iPref++) { 92 string obsType1 = (preferredAttrib[iPref] == ' ?') ? string("1") : string("1") + preferredAttrib[iPref];93 string obsType2 = (preferredAttrib[iPref] == ' ?') ? string("2") : string("2") + preferredAttrib[iPref];92 string obsType1 = (preferredAttrib[iPref] == '_') ? string("1") : string("1") + preferredAttrib[iPref]; 93 string obsType2 = (preferredAttrib[iPref] == '_') ? string("2") : string("2") + preferredAttrib[iPref]; 94 94 if (_validObs1 == 0) { 95 95 for (unsigned ii = 0; ii < _allObs.size(); ii++) {
Note:
See TracChangeset
for help on using the changeset viewer.