Changeset 5776 in ntrip for trunk/BNC/src/ephemeris.cpp
- Timestamp:
- Aug 4, 2014, 11:34:04 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/ephemeris.cpp
r5749 r5776 75 75 _receptDateTime = currentDateAndTimeGPS(); 76 76 77 _prn = QString("G%1").arg(ee->satellite, 2, 10, QChar('0'));77 _prn.set('G', ee->satellite); 78 78 79 79 _TOC.set(ee->GPSweek, ee->TOC); … … 276 276 277 277 GPSADDBITS(12, 1019) 278 GPSADDBITS(6,_prn. right((_prn.length()-1)).toInt())278 GPSADDBITS(6,_prn.number()) 279 279 GPSADDBITS(10, _TOC.gpsw()) 280 280 GPSADDBITS(4, _ura) … … 416 416 _receptDateTime = currentDateAndTimeGPS(); 417 417 418 _prn = QString("R%1").arg(ee->almanac_number, 2, 10, QChar('0'));418 _prn.set('R', ee->almanac_number); 419 419 420 420 int ww = ee->GPSWeek; … … 541 541 542 542 GLONASSADDBITS(12, 1020) 543 GLONASSADDBITS(6, _prn. right((_prn.length()-1)).toInt())543 GLONASSADDBITS(6, _prn.number()) 544 544 GLONASSADDBITS(5, 7+_frequency_number) 545 545 GLONASSADDBITS(1, 0) … … 600 600 _receptDateTime = currentDateAndTimeGPS(); 601 601 602 _prn = QString("E%1").arg(ee->satellite, 2, 10, QChar('0'));602 _prn.set('E', ee->satellite); 603 603 604 604 _TOC.set(ee->Week, ee->TOC); … … 749 749 750 750 GALILEOADDBITS(12, inav ? 1046 : 1045) 751 GALILEOADDBITS(6, _prn. right((_prn.length()-1)).toInt())751 GALILEOADDBITS(6, _prn.number()) 752 752 GALILEOADDBITS(12, _TOC.gpsw()) 753 753 GALILEOADDBITS(10, _IODnav) … … 844 844 double sec; 845 845 846 in >> _prn >> year >> month >> day >> hour >> min >> sec; 847 848 if (_prn.at(0) != 'G') { 849 _prn = QString("G%1").arg(_prn.toInt(), 2, 10, QLatin1Char('0')); 850 } 851 846 QString prnStr; 847 in >> prnStr >> year >> month >> day >> hour >> min >> sec; 848 if (prnStr.at(0) == 'G') { 849 _prn.set('G', prnStr.mid(1).toInt()); 850 } 851 else { 852 _prn.set('G', prnStr.toInt()); 853 } 854 852 855 if (year < 80) { 853 856 year += 2000; … … 964 967 double sec; 965 968 966 in >> _prn >> year >> month >> day >> hour >> min >> sec; 967 968 if (_prn.at(0) != 'R') { 969 _prn = QString("R%1").arg(_prn.toInt(), 2, 10, QLatin1Char('0')); 970 } 971 969 QString prnStr; 970 in >> prnStr >> year >> month >> day >> hour >> min >> sec; 971 if (prnStr.at(0) == 'R') { 972 _prn.set('R', prnStr.mid(1).toInt()); 973 } 974 else { 975 _prn.set('R', prnStr.toInt()); 976 } 977 972 978 if (year < 80) { 973 979 year += 2000; … … 1066 1072 double sec; 1067 1073 1068 in >> _prn >> year >> month >> day >> hour >> min >> sec; 1069 1070 if (_prn.at(0) != 'E') { 1071 _prn = QString("E%1").arg(_prn.toInt(), 2, 10, QLatin1Char('0')); 1072 } 1073 1074 QString prnStr; 1075 in >> prnStr >> year >> month >> day >> hour >> min >> sec; 1076 if (prnStr.at(0) == 'E') { 1077 _prn.set('E', prnStr.mid(1).toInt()); 1078 } 1079 else { 1080 _prn.set('E', prnStr.toInt()); 1081 } 1082 1074 1083 if (year < 80) { 1075 1084 year += 2000; … … 1152 1161 // 1153 1162 ////////////////////////////////////////////////////////////////////////////// 1154 QString t_eph::rinexDateStr(const bncTime& tt, const QString& prn, 1155 double version) { 1163 QString t_eph::rinexDateStr(const bncTime& tt, const t_prn& prn, double version) { 1164 QString prnStr(prn.toString().c_str()); 1165 return rinexDateStr(tt, prnStr, version); 1166 } 1167 1168 // 1169 ////////////////////////////////////////////////////////////////////////////// 1170 QString t_eph::rinexDateStr(const bncTime& tt, const QString& prnStr, double version) { 1156 1171 1157 1172 QString datStr; … … 1165 1180 1166 1181 if (version < 3.0) { 1167 QString prnHlp = prn .mid(1,2); if (prnHlp[0] == '0') prnHlp[0] = ' ';1182 QString prnHlp = prnStr.mid(1,2); if (prnHlp[0] == '0') prnHlp[0] = ' '; 1168 1183 out << prnHlp << QString(" %1 %2 %3 %4 %5%6") 1169 1184 .arg(year % 100, 2, 10, QChar('0')) … … 1175 1190 } 1176 1191 else { 1177 out << prn << QString(" %1 %2 %3 %4 %5 %6")1192 out << prnStr << QString(" %1 %2 %3 %4 %5 %6") 1178 1193 .arg(year, 4) 1179 1194 .arg(month, 2, 10, QChar('0'))
Note:
See TracChangeset
for help on using the changeset viewer.