Changeset 4501 in ntrip


Ignore:
Timestamp:
Aug 12, 2012, 12:06:59 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r4500 r4501  
    177177// Read Skeleton Header File
    178178////////////////////////////////////////////////////////////////////////////
    179 void bncRinex::readSkeleton() {
     179void bncRinex::readSkeleton(bool& obsTypesFound) {
    180180
    181181  // Read the local file
     
    206206  }
    207207
     208  obsTypesFound = true;
     209
    208210  // Default RINEX v2 Types
    209211  // -------------------------
    210212  if (_header._obsTypesV2.size() == 0) {
     213    if (_header._version < 3.0) {
     214      obsTypesFound = false;
     215    }
    211216    _header._obsTypesV2 << "C1" << "P1" << "L1" << "S1"
    212217                        << "C2" << "P2" << "L2" << "S2";
     
    216221  // -------------------------
    217222  if (_header._obsTypesV3.size() == 0) {
     223    if (_header._version >= 3.0) {
     224      obsTypesFound = false;
     225    }
    218226    _header._obsTypesV3['G'] << "C1C" << "L1C" << "D1C" << "S1C"
    219227                             << "C1P" << "L1P" << "D1P" << "S1P"
     
    383391  // Copy Skeleton Header
    384392  // --------------------
    385   readSkeleton();
     393  bool obsTypesFound;
     394  readSkeleton(obsTypesFound);
    386395  if (_header._markerName.isEmpty()) {
    387396    _header._markerName = _statID;
  • trunk/BNC/src/bncrinex.h

    r4489 r4501  
    5555   static std::string obsToStr(double val, int width = 14, int precision = 3);
    5656   void resolveFileName(const QDateTime& datTim);
    57    void readSkeleton();
     57   void readSkeleton(bool& obsTypesFound);
    5858   void writeHeader(const QByteArray& format, const QDateTime& datTimNom);
    5959   void closeFile();
Note: See TracChangeset for help on using the changeset viewer.