Changeset 6349 in ntrip for trunk


Ignore:
Timestamp:
Nov 26, 2014, 6:19:28 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r6331 r6349  
    178178    getline(_stream, _lastLine);
    179179    if (_stream.eof() || _lastLine.find("EOF") == 0) {
    180       throw "t_sp3File: end of file";
     180      delete _currEpoch; _currEpoch = 0;
    181181      break;
    182182    }
  • trunk/BNC/src/orbComp/sp3Comp.cpp

    r6348 r6349  
    9595  }
    9696
     97  try {
     98    compare();
     99  }
     100  catch (const string& error) {
     101    *_log << "ERROR: " << error.c_str() << endl;
     102    emit finished();
     103    return;
     104  }
     105  catch (const char* error) {
     106    *_log << "ERROR: " << error << endl;
     107    emit finished();
     108    return;
     109  }
    97110
    98111  // Exit (thread)
     
    212225        if (epochOK) {
    213226          epochs.push_back(epo);
     227          cout << "OK: " << string(epo->_tt) << endl;
    214228        }
    215229        else {
    216230          delete epo;
    217231        }
    218       }
    219     }
    220   }
     232        break;
     233      }
     234    }
     235  }
     236
     237  cout << "NUMEPO: " << epochs.size() << endl;
    221238
    222239  // Transform xyz into radial, along-track, and out-of-plane
Note: See TracChangeset for help on using the changeset viewer.