Changeset 6137 in ntrip for trunk/BNC/src/bncgetthread.cpp
- Timestamp:
- Sep 13, 2014, 12:19:37 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncgetthread.cpp
r5903 r6137 471 471 // Loop over all observations (observations output) 472 472 // ------------------------------------------------ 473 QListIterator<t_ obs> it(decoder()->_obsList);474 475 QList<t_ obs> obsListHlp;473 QListIterator<t_satObs> it(decoder()->_obsList); 474 475 QList<t_satObs> obsListHlp; 476 476 477 477 while (it.hasNext()) { 478 const t_obs& obs = it.next(); 479 480 QString prn = QString("%1%2").arg(obs.satSys) 481 .arg(obs.satNum, 2, 10, QChar('0')); 482 long iSec = long(floor(obs.GPSWeeks+0.5)); 483 long obsTime = obs.GPSWeek * 7*24*3600 + iSec; 478 const t_satObs& obs = it.next(); 479 480 QString prn(obs._prn.toString().c_str()); 481 long iSec = long(floor(obs._time.gpssec()+0.5)); 482 long obsTime = obs._time.gpsw()*7*24*3600 + iSec; 484 483 485 484 // Check observation epoch … … 660 659 // ----------------------- 661 660 for (int ii = 0; ii < decoder()->_obsList.size(); ii++) { 662 t_ obs& obs = decoder()->_obsList[ii];663 QVector<QString>& rnxTypes = _rnxTypes[obs. satSys];661 t_satObs& obs = decoder()->_obsList[ii]; 662 QVector<QString>& rnxTypes = _rnxTypes[obs._prn.system()]; 664 663 bool allFound = true; 665 for (int iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) { 666 if (obs._measdata[iEntry] != 0.0) { 667 if (rnxTypes.indexOf(obs.rnxStr(iEntry)) == -1) { 668 allFound = false; 669 rnxTypes << obs.rnxStr(iEntry); 670 } 664 for (unsigned iFrq = 0; iFrq < obs._obs.size(); iFrq++) { 665 QString rnxStr(obs._obs[iFrq]->_rnxType2ch.c_str()); 666 if (rnxTypes.indexOf(rnxStr) == -1) { 667 allFound = false; 668 rnxTypes << rnxStr; 671 669 } 672 670 } … … 674 672 QString msg; 675 673 QTextStream str(&msg); 676 str << obs. satSys<< " " << rnxTypes.size() << " ";674 str << obs._prn.system() << " " << rnxTypes.size() << " "; 677 675 for (int iType = 0; iType < rnxTypes.size(); iType++) { 678 676 str << " " << rnxTypes[iType];
Note:
See TracChangeset
for help on using the changeset viewer.