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

Timestamp:

Jun 9, 2022, 5:10:10 PM (23 months ago)

Author:

stuerze

Message:

initial changes to consider RINEX Version 4 in future

File:

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

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -164 +164 @@
       in >> _antBSG[0] >> _antBSG[1] >> _antBSG[2];
     }
+    else if (key == "DOI") {
+      _digitalObjectId = line.mid(0,60).trimmed();
+    }
+    else if (key == "LICENSE OF USE") {
+      _licenseOfUse.append(line.mid(0,60).trimmed());
+    }
+    else if (key == "STATION INFORMATION") {
+     _stationInformation.append(line.mid(0,60).trimmed());
+    }
     else if (key == "# / TYPES OF OBSERV") {
       if (_version == 0.0) {
-        _version = defaultRnxObsVersion2;
+        _version = defaultRnxObsVersion3;
       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
@@ -306 +315 @@
   _markerName = markerName;
 
-  if (version <= 2) {
+  if (version == 2) {
     _version = defaultRnxObsVersion2;
   }
-  else {
+  else if (version == 3) {
     _version = defaultRnxObsVersion3;
+  }
+  else if (version == 4) {
+    _version = defaultRnxObsVersion4;
   }
 
@@ -389 +401 @@
                          const QStringList* gloSlots) {
 
-  if (version <= 2) {
+  if (version == 2) {
     _version = defaultRnxObsVersion2;
   }
-  else {
+  else if (version == 3) {
     _version = defaultRnxObsVersion3;
+  }
+  else if (version == 4) {
+    _version = defaultRnxObsVersion4;
   }
   _interval        = header._interval;
@@ -914 +929 @@
       return t_rnxObsFile::type3to2(sys, origType);
     }
-    else if (int(version) == 3) {
+    else {
       return t_rnxObsFile::type2to3(sys, origType);
     }