Changeset 6194 in ntrip


Ignore:
Timestamp:
Sep 14, 2014, 5:12:48 PM (7 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM/RTCM2Decoder.cpp

    r6137 r6194  
    141141          }                     
    142142          else {
    143             obs._prn.set('R', _ObsBlock.PRN[iSat]);
     143            obs._prn.set('G', _ObsBlock.PRN[iSat]);
    144144          }                     
     145          char sys = obs._prn.system();
    145146          obs._time.set(epochWeek, epochSecs);
    146147          t_frqObs* frqObs1C = new t_frqObs;
     
    151152
    152153          t_frqObs* frqObs1P = new t_frqObs;
    153           frqObs1P->_rnxType2ch  = "1P";
     154          frqObs1P->_rnxType2ch  = (sys == 'G') ? "1W" : "1P";
    154155          frqObs1P->_codeValid   = true;
    155156          frqObs1P->_code        = _ObsBlock.rng_P1[iSat];
     
    161162
    162163          t_frqObs* frqObs2P = new t_frqObs;
    163           frqObs2P->_rnxType2ch  = "2P";
     164          frqObs2P->_rnxType2ch  = (sys == 'G') ? "2W" : "2P";
    164165          frqObs2P->_codeValid   = true;
    165166          frqObs2P->_code        = _ObsBlock.rng_P2[iSat];
     
    281282
    282283    QString prn;
     284    char    sys;
    283285    if (corr->PRN < 200) {
    284       prn = 'G' + QString("%1").arg(corr->PRN, 2, 10, QChar('0'));
     286      sys = 'G';
     287      prn = sys + QString("%1").arg(corr->PRN, 2, 10, QChar('0'));
    285288    }
    286289    else {
    287       prn = 'R' + QString("%1").arg(corr->PRN - 200, 2, 10, QChar('0'));
     290      sys = 'R';
     291      prn = sys + QString("%1").arg(corr->PRN - 200, 2, 10, QChar('0'));
    288292    }
    289293
     
    304308
    305309    t_frqObs* frqObs1P = new t_frqObs;
    306     frqObs1P->_rnxType2ch  = "1P";
     310    frqObs1P->_rnxType2ch  = (sys == 'G') ? "1W" : "1P";
    307311    new_obs->_obs.push_back(frqObs1P);
    308312
    309313    t_frqObs* frqObs2P = new t_frqObs;
    310     frqObs2P->_rnxType2ch  = "2P";
     314    frqObs2P->_rnxType2ch  = (sys == 'G') ? "2W" : "2P";
    311315    new_obs->_obs.push_back(frqObs2P);
    312316
Note: See TracChangeset for help on using the changeset viewer.