Changeset 9870 in ntrip for trunk/BNC/src/rinex/rnxobsfile.cpp

Timestamp:

Nov 3, 2022, 9:44:02 PM (2 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/rinex/rnxobsfile.cpp (modified) (5 diffs)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -190 +190 @@
     else if (key == "# / TYPES OF OBSERV") {
       if (_version == 0.0) {
-        _version = defaultRnxObsVersion2;
-      }
+         _version = defaultRnxObsVersion2;
+       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
       int nTypes;
@@ -214 +214 @@
     else if (key == "SYS / # / OBS TYPES") {
       if (_version == 0.0) {
-        bncSettings settings;
-        _version = versionFromInt(settings.value("rnxVersion").toInt());
+        _version = defaultRnxObsVersion3;
       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
@@ -321 +320 @@
     _usedSystems += QChar(it.key());
   }
-
+  
   return success;
 }
@@ -409 +408 @@
                          const QStringList* gloSlots) {
 
-  if (version == 2) {
-    _version = defaultRnxObsVersion2;
-  }
-  else if (version == 3) {
-    _version = defaultRnxObsVersion3;
-  }
-  else if (version == 4) {
-    _version = defaultRnxObsVersion4;
-  }
+  _version = versionFromInt(version);
+
   _interval        = header._interval;
   _antennaNumber   = header._antennaNumber;
@@ -925 +917 @@
 ////////////////////////////////////////////////////////////////////////////
 QString t_rnxObsHeader::obsType(char sys, int index, double version) const {
-
   if (version == 0.0) {
     version = _version;
   }
+
   if (_obsTypes.contains(sys)) {
     QString origType = _obsTypes[sys].at(index);