Changeset 3383 in ntrip for trunk/BNC/bncpppclient.cpp


Ignore:
Timestamp:
Aug 30, 2011, 4:56:38 PM (13 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bncpppclient.cpp

    r3319 r3383  
    194194      satData->lambda3 = c1 * t_CST::c / f1 + c2 * t_CST::c / f2;
    195195
    196       _epoData.back()->satDataGPS[satData->prn] = satData;
     196      _epoData.back()->satData[satData->prn] = satData;
    197197    }
    198198    else {
     
    227227      satData->lambda3 = c1 * t_CST::c / f1 + c2 * t_CST::c / f2;
    228228
    229       _epoData.back()->satDataGlo[satData->prn] = satData;
     229      _epoData.back()->satData[satData->prn] = satData;
    230230    }
    231231    else {
     
    250250      satData->L3      = c1 * satData->L1 + c5 * satData->L5;
    251251      satData->lambda3 = c1 * t_CST::c / f1 + c5 * t_CST::c / f5;
    252       _epoData.back()->satDataGal[satData->prn] = satData;
     252      _epoData.back()->satData[satData->prn] = satData;
    253253    }
    254254    else {
     
    459459  // Data Pre-Processing
    460460  // -------------------
    461   QMutableMapIterator<QString, t_satData*> iGPS(_epoData.front()->satDataGPS);
    462   while (iGPS.hasNext()) {
    463     iGPS.next();
    464     QString    prn     = iGPS.key();
    465     t_satData* satData = iGPS.value();
     461  QMutableMapIterator<QString, t_satData*> it(_epoData.front()->satData);
     462  while (it.hasNext()) {
     463    it.next();
     464    QString    prn     = it.key();
     465    t_satData* satData = it.value();
    466466
    467467    if (cmpToT(satData) != success) {
    468468      delete satData;
    469       iGPS.remove();
    470       continue;
    471     }
    472   }
    473 
    474   QMutableMapIterator<QString, t_satData*> iGlo(_epoData.front()->satDataGlo);
    475   while (iGlo.hasNext()) {
    476     iGlo.next();
    477     QString    prn     = iGlo.key();
    478     t_satData* satData = iGlo.value();
    479 
    480     if (cmpToT(satData) != success) {
    481       delete satData;
    482       iGlo.remove();
    483       continue;
    484     }
    485   }
    486 
    487   QMutableMapIterator<QString, t_satData*> iGal(_epoData.front()->satDataGal);
    488   while (iGal.hasNext()) {
    489     iGal.next();
    490     QString    prn     = iGal.key();
    491     t_satData* satData = iGal.value();
    492 
    493     if (cmpToT(satData) != success) {
    494       delete satData;
    495       iGal.remove();
     469      it.remove();
    496470      continue;
    497471    }
Note: See TracChangeset for help on using the changeset viewer.