Changeset 9930 in ntrip
- Timestamp:
- Nov 30, 2022, 1:55:40 PM (21 months ago)
- Location:
- trunk/BNC/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncephuser.cpp
r9929 r9930 187 187 void bncEphUser::checkEphemeris(t_eph* eph, bool realTime) { 188 188 189 if ( eph->prn().system() != 'R' || eph->prn().system() != 'G')189 if (!eph) { 190 190 return; 191 cout << "\ncheckEphemeris "; 192 193 if (!eph) { 194 return; cout << "no eph "; 195 } 196 cout << eph->prn().toString().c_str() << " "; 191 } 197 192 198 193 // Check whether the epoch is too far away the current time … … 217 212 ColumnVector vv(3); 218 213 if (eph->getCrd(eph->TOC(), xc, vv, false) != success) { 219 eph->setCheckState(t_eph::bad); cout << "eph->getCrd() != success: bad ";214 eph->setCheckState(t_eph::bad); 220 215 return; 221 216 } … … 225 220 const double MAXDIST = 6.e7; 226 221 if (rr < MINDIST || rr > MAXDIST || std::isnan(rr)) { 227 eph->setCheckState(t_eph::bad); cout << " eph MIN/MAXDIST: bad ";222 eph->setCheckState(t_eph::bad); 228 223 return; 229 224 } … … 244 239 } 245 240 246 if (ephL ) {241 if (ephL && ephL->checkState() != t_eph::bad) { 247 242 ColumnVector xcL(6); 248 243 ColumnVector vvL(3); 249 244 if (ephL->getCrd(eph->TOC(), xcL, vvL, false) != success) { 250 eph ->setCheckState(t_eph::bad); cout << " ephL->getCrd() != success: bad ";245 ephL->setCheckState(t_eph::bad); 251 246 return; 252 247 } -
trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
r9928 r9930 322 322 // If there is there more than 1 epoch line in the buffer 323 323 while (_rtnetStreamBuffer.count('*') > 1) { 324 //cout << "more than 1 epoch in buffer: " << _rtnetStreamBuffer.count('*') << endl;325 //cout <<"XX MORE THAN 1 EPOCH XXX\n" << _rtnetStreamBuffer.toStdString().c_str() << "\nXXXXXXXXXXXXXXXXX" <<endl;326 324 emit(newMessage(QString("bncRtnetUploadCaster: more than 1 epoch in buffer: %1").arg(_rtnetStreamBuffer.count('*')).toLatin1(), false)); 327 325 QString rtnetStreamBuffer = _rtnetStreamBuffer; … … 330 328 _rtnetStreamBuffer = _rtnetStreamBuffer.mid(1); 331 329 if (nextEpoch != -1 && nextEpoch < iEpoEnd) { 332 rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch, nextEpochEnd); //cout <<"== ONE EPOCH=\n" << rtnetStreamBuffer.toStdString().c_str() << "\n=ONE EPOCH =="<<endl;330 rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch, nextEpochEnd); 333 331 lines = rtnetStreamBuffer.split('\n', QString::SkipEmptyParts); 334 332 if (lines.size() > 2) { 335 //cout << "----------LINES 2 DECODE (IN WHILE)-------------\n" << rtnetStreamBuffer.toStdString().c_str() << "\n------------------" << endl;336 333 decodeRtnetEpoch(lines); 337 334 } … … 339 336 _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpochEnd+3); 340 337 } 341 else if (nextEpoch != -1 && nextEpoch >= iEpoEnd) { //cout << "bin hier" << endl;338 else if (nextEpoch != -1 && nextEpoch >= iEpoEnd) { 342 339 break; 343 340 } … … 345 342 346 343 lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts); 347 //cout << "----------LINES 2 DECODE (OUTSIDE)-------------\n" << _rtnetStreamBuffer.left(iEpoEnd).toStdString().c_str() << "\n------------------" << endl; 344 348 345 _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3); 349 //cout <<"YYYY REST OF BUFFER YYYY\n" << _rtnetStreamBuffer.toStdString().c_str() << "\nYYYYYY" <<endl; 346 350 347 if (lines.size() < 2) { 351 348 emit(newMessage(QString("bncRtnetUploadCaster: less than 2 lines to decode : %1").arg(_casterID).toLatin1(), false)); … … 361 358 // Read first line (with epoch time) 362 359 // --------------------------------- 363 QTextStream in(epochLines[0].toLatin1()); //cout << epochLines[0].toLatin1().toStdString() << " : ";360 QTextStream in(epochLines[0].toLatin1()); 364 361 QString hlp; 365 362 int year, month, day, hour, min; … … 367 364 in >> hlp >> year >> month >> day >> hour >> min >> sec; 368 365 bncTime epoTime; 369 epoTime.set(year, month, day, hour, min, sec); //cout << "decodeEpoch: " << epoTime.timestr().c_str() << endl;366 epoTime.set(year, month, day, hour, min, sec); 370 367 371 368 emit(newMessage( … … 544 541 } 545 542 } 546 if (eph) { cout << eph->prn().toString().c_str() << " checkstate: " << eph->checkState() << endl;} 543 547 544 if (eph && 548 545 !outDatedBcep(eph) && // detected from storage because of no update … … 1082 1079 sd->Orbit.DotDeltaCrossTrack = dotRsw(3); 1083 1080 1084 if (corrIsOutOfRange(sd)) { cout << "\n corrIsOutOfRange" << endl;1081 if (corrIsOutOfRange(sd)) { 1085 1082 return failure; 1086 1083 }
Note:
See TracChangeset
for help on using the changeset viewer.