Changeset 6149 in ntrip for trunk/BNC/src/bncrinex.cpp


Ignore:
Timestamp:
Sep 13, 2014, 9:23:11 PM (8 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncrinex.cpp

    r6148 r6149  
    386386    }
    387387    else {
    388       _header._obsTypes['G'] << "C1C" << "L1C" << "D1C" << "S1C"
    389                              << "C1P" << "L1P" << "D1P" << "S1P"
    390                              << "C2C" << "L2C" << "D2C" << "S2C"
    391                              << "C2P" << "L2P" << "D2P" << "S2P"
    392                              << "C5"  << "D5"  << "L5"  << "S5";
     388      _header._obsTypes['G'] << "C1C" << "L1C"  << "S1C"
     389                             << "C2W" << "L2W"  << "S2W"
     390                             << "C5"  << "L5"   << "S5";
    393391     
    394       _header._obsTypes['R'] << "C1C" << "L1C" << "D1C" << "S1C"
    395                              << "C1P" << "L1P" << "D1P" << "S1P"
    396                              << "C2C" << "L2C" << "D2C" << "S2C"
    397                              << "C2P" << "L2P" << "D2P" << "S2P";
     392      _header._obsTypes['J'] = _header._obsTypes['G'];
    398393     
    399       _header._obsTypes['E'] << "C1" << "L1" << "D1" << "S1"
    400                              << "C5" << "L5" << "D5" << "S5"
    401                              << "C6" << "L6" << "D6" << "S6"
    402                              << "C7" << "L7" << "D7" << "S7"
    403                              << "C8" << "L8" << "D8" << "S8";
     394      _header._obsTypes['R'] << "C1C" << "L1C" << "S1C"
     395                             << "C2P" << "L2P" << "S2P";
    404396     
    405       _header._obsTypes['J'] << "C1" << "L1" << "D1" << "S1"
    406                              << "C2" << "L2" << "D2" << "S2"
    407                              << "C5" << "L5" << "D5" << "S5"
    408                              << "C6" << "D6" << "L6" << "S6";
     397      _header._obsTypes['E'] << "C1" << "L1" << "S1"
     398                             << "C5" << "L5" << "S5"
     399                             << "C7" << "L7" << "S7"
     400                             << "C8" << "L8" << "S8";
    409401     
    410       _header._obsTypes['S'] << "C1" << "L1" << "D1" << "S1"
    411                              << "C5" << "L5" << "D5" << "S5";
     402      _header._obsTypes['S'] << "C1" << "L1" << "S1"
     403                             << "C5" << "L5" << "S5";
    412404     
    413       _header._obsTypes['C'] << "C1" << "L1" << "D1" << "S1"
    414                              << "C6" << "L6" << "D6" << "S6"
    415                              << "C7" << "L7" << "D7" << "S7";
     405      _header._obsTypes['C'] << "C1" << "L1" << "S1"
     406                             << "C6" << "L6" << "S6"
     407                             << "C7" << "L7" << "S7";
    416408    }
    417409  }
     
    613605    double  obsValue = 0.0;
    614606    char    lli      = ' ';
    615     QString rnxType = types[ii];
     607    QString rnxType = t_rnxObsFile::type2to3(types[ii]);
    616608    for (unsigned iFrq = 0; iFrq < obs._obs.size(); iFrq++) {
    617609      const t_frqObs* frqObs = obs._obs[iFrq];
    618610      for (int ik = 0; ik < obsKinds.length(); ik++) {
    619611        QChar ch = obsKinds[ik];
    620         QString obsType  = (ch + QString(frqObs->_rnxType2ch.c_str())).left(rnxType.length());
     612        QString obsType = (ch + QString(frqObs->_rnxType2ch.c_str()));
     613        obsType = t_rnxObsFile::type2to3(obsType).left(rnxType.length());
    621614        if (rnxType == obsType) {
    622615          if      (ch == 'L' && frqObs->_phaseValid) {
Note: See TracChangeset for help on using the changeset viewer.