Changeset 6880 in ntrip


Ignore:
Timestamp:
Jun 8, 2015, 9:38:19 AM (5 years ago)
Author:
stuerze
Message:

minor changes to read rinex nav files with blank space between satellite system and number

File:
1 edited

Legend:

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

    r6843 r6880  
    163163
    164164      QString prnStr;
    165       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
     165      in >> prnStr;
     166      if (prnStr.size() == 1) {
     167        in >> prnStr;
     168      }
     169      in >> year >> month >> day >> hour >> min >> sec;
    166170      if      (prnStr.at(0) == 'G') {
    167171        _prn.set('G', prnStr.mid(1).toInt());
     
    440444
    441445      QString prnStr;
    442       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
     446      in >> prnStr;
     447      if (prnStr.size() == 1) {
     448        in >> prnStr;
     449      }
     450      in >> year >> month >> day >> hour >> min >> sec;
    443451      if (prnStr.at(0) == 'R') {
    444452        _prn.set('R', prnStr.mid(1).toInt());
     
    673681    if      ( iLine == 0 ) {
    674682      QTextStream in(line.left(pos[1]).toAscii());
    675 
    676       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
     683      in >> prnStr;
     684      if (prnStr.size() == 1) {
     685        in >> prnStr;
     686      }
     687      in >> year >> month >> day >> hour >> min >> sec;
    677688      if      (year <  80) {
    678689        year += 2000;
     
    10421053      int    year, month, day, hour, min;
    10431054      double sec;
    1044      
     1055
    10451056      QString prnStr;
    1046       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
     1057      in >> prnStr;
     1058      if (prnStr.size() == 1) {
     1059        in >> prnStr;
     1060      }
     1061      in >> year >> month >> day >> hour >> min >> sec;
    10471062      if (prnStr.at(0) == 'S') {
    10481063        _prn.set('S', prnStr.mid(1).toInt());
     
    12041219      int    year, month, day, hour, min;
    12051220      double sec;
    1206      
     1221
    12071222      QString prnStr;
    1208       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
     1223      in >> prnStr;
     1224      if (prnStr.size() == 1) {
     1225        in >> prnStr;
     1226      }
     1227      in >> year >> month >> day >> hour >> min >> sec;
    12091228      if (prnStr.at(0) == 'C') {
    12101229        _prn.set('C', prnStr.mid(1).toInt());
Note: See TracChangeset for help on using the changeset viewer.