Changeset 9870 in ntrip


Ignore:
Timestamp:
Nov 3, 2022, 9:44:02 PM (5 weeks ago)
Author:
stuerze
Message:

minor changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/rinex/rnxobsfile.cpp

    r9770 r9870  
    190190    else if (key == "# / TYPES OF OBSERV") {
    191191      if (_version == 0.0) {
    192         _version = defaultRnxObsVersion2;
    193       }
     192         _version = defaultRnxObsVersion2;
     193       }
    194194      QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
    195195      int nTypes;
     
    214214    else if (key == "SYS / # / OBS TYPES") {
    215215      if (_version == 0.0) {
    216         bncSettings settings;
    217         _version = versionFromInt(settings.value("rnxVersion").toInt());
     216        _version = defaultRnxObsVersion3;
    218217      }
    219218      QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
     
    321320    _usedSystems += QChar(it.key());
    322321  }
    323 
     322 
    324323  return success;
    325324}
     
    409408                         const QStringList* gloSlots) {
    410409
    411   if (version == 2) {
    412     _version = defaultRnxObsVersion2;
    413   }
    414   else if (version == 3) {
    415     _version = defaultRnxObsVersion3;
    416   }
    417   else if (version == 4) {
    418     _version = defaultRnxObsVersion4;
    419   }
     410  _version = versionFromInt(version);
     411
    420412  _interval        = header._interval;
    421413  _antennaNumber   = header._antennaNumber;
     
    925917////////////////////////////////////////////////////////////////////////////
    926918QString t_rnxObsHeader::obsType(char sys, int index, double version) const {
    927 
    928919  if (version == 0.0) {
    929920    version = _version;
    930921  }
     922
    931923  if (_obsTypes.contains(sys)) {
    932924    QString origType = _obsTypes[sys].at(index);
Note: See TracChangeset for help on using the changeset viewer.