Changeset 6259 in ntrip for trunk/BNC/src/rinex/rnxobsfile.cpp


Ignore:
Timestamp:
Oct 24, 2014, 4:55:00 PM (10 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r6258 r6259  
    11191119void t_rnxObsFile::setObsFromRnx(const t_rnxObsFile* rnxObsFile, const t_rnxObsFile::t_rnxEpo* epo,
    11201120                                 const t_rnxObsFile::t_rnxSat& rnxSat, t_satObs& obs) {
    1121 
    11221121  obs._staID = rnxObsFile->markerName().toAscii().constData();
    11231122  obs._prn   = rnxSat.prn;
     
    11261125  char sys   = rnxSat.prn.system();
    11271126
     1127  QChar addToL2;
    11281128  for (int iType = 0; iType < rnxObsFile->nTypes(sys); iType++) {
    11291129    QString type   = rnxObsFile->obsType(sys, iType);
    11301130    QString typeV3 = rnxObsFile->obsType(sys, iType, 3.0); // may or may not differ from type
     1131    if (rnxSat.obs.contains(type) && rnxSat.obs[type].value != 0.0) {
     1132      if (type == "P2" && typeV3.length() > 2) {
     1133        addToL2 = typeV3[2];
     1134        break;
     1135      }
     1136    }
     1137  }
     1138
     1139  for (int iType = 0; iType < rnxObsFile->nTypes(sys); iType++) {
     1140    QString type   = rnxObsFile->obsType(sys, iType);
     1141    QString typeV3 = rnxObsFile->obsType(sys, iType, 3.0); // may or may not differ from type
     1142    if (type == "L2") {
     1143      typeV3 += addToL2;
     1144    }
    11311145    if (rnxSat.obs.contains(type)) {
    11321146      const t_rnxObs& rnxObs = rnxSat.obs[type];
Note: See TracChangeset for help on using the changeset viewer.