Changeset 7665 in ntrip


Ignore:
Timestamp:
Jan 11, 2016, 2:01:13 PM (4 years ago)
Author:
stuerze
Message:

minor changes ragarding rinex obs file writing with incomplete skl file

Location:
trunk/BNC/src
Files:
3 edited

Legend:

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

    r7505 r7665  
    163163    if (query->status() == bncNetQuery::finished &&
    164164        outData.contains("END OF HEADER")) {
    165       irc = success;
    166165      QTextStream in(outData);
    167       _sklHeader.read(&in);
     166      irc = _sklHeader.read(&in);
    168167    }
    169168
     
    184183  QFile skl(_sklName);
    185184  if ( skl.exists() && skl.open(QIODevice::ReadOnly) ) {
    186     readDone = true;
    187185    QTextStream in(&skl);
    188     _sklHeader.read(&in);
     186    if (_sklHeader.read(&in) == success) {
     187      readDone = true;
     188    }
    189189  }
    190190
  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r7478 r7665  
    6363    _wlFactorsL2[iPrn] = 1;
    6464  }
     65  bncSettings settings;
     66  _writeRinexOnlyWithSklObsTypes = settings.value("rnxOnlyWithSKL").toBool();
    6567}
    6668
     
    278280  // ----------------------------------------------------
    279281  if (_obsTypes.empty()) {
    280     setDefault(_markerName, _version);
     282    if (!_writeRinexOnlyWithSklObsTypes) {
     283      setDefault(_markerName, _version);
     284    }
     285    else {
     286      return failure;
     287    }
    281288  }
    282289
  • trunk/BNC/src/rinex/rnxobsfile.h

    r7474 r7665  
    9797  int                     _wlFactorsL2[t_prn::MAXPRN_GPS+1];
    9898  bncTime                 _startTime;
     99  bool                    _writeRinexOnlyWithSklObsTypes;
     100
    99101  QMap<QString, QPair<double, QStringList> > _phaseShifts;
    100102};
Note: See TracChangeset for help on using the changeset viewer.