Changeset 10587 in ntrip for trunk/BNC/src/rinex/rnxnavfile.cpp

Timestamp:

Dec 10, 2024, 3:57:21 PM (3 days ago)

Author:

stuerze

Message:

RINEX version 4.02 updates

File:

• trunk/BNC/src/rinex/rnxnavfile.cpp (modified) (11 diffs)

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -149 +149 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxNavFile::read(QTextStream* stream) {
-  QString ephType;
 
   while (stream->status() == QTextStream::Ok && !stream->atEnd()) {
@@ -157 +156 @@
       continue;
     }
-
+    QString navType;
     QStringList hlp = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts);
-    QString key, prn, navSubType;
+    QString prn;
     char sys;
-
     QString firstStr = hlp.at(0);
-    if      (version() >= 3.0 &&  firstStr != ">") {
+
+    // RINEX version 3
+    if      (version() >= 3.0 &&
+             version() <  4.0 &&  firstStr != ">") {
       prn = firstStr;
       sys = prn[0].toLatin1();
-    }
+      navType = "";
+    }
+    // RINEX version 4
     else if (version() >= 4.0 && firstStr == ">") {
-      key = hlp.at(1);
+      QString key = hlp.at(1);
       prn = hlp.at(2);
       sys = prn[0].toLatin1();
-      ephType = hlp.at(3);
+      navType = hlp.at(3);
 
       // ALL Non-EPH messages are currently ignored
@@ -194 +197 @@
                  sys == 'J' || sys == 'I') {
           lines2skip = 3;
-          if ((sys == 'I' && ephType == "L1NV") || // I: KLOB, NEQN
-              (sys == 'J' && ephType == "CNVX")) { // J: WIDE, JAPN
-            navSubType = hlp.at(4);
+          if ((sys == 'I' && navType == "L1NV") || // I: KLOB, NEQN
+              (sys == 'J' && navType == "CNVX")) { // J: WIDE, JAPN
+            QString navSubType = hlp.at(4);
             if      (navSubType == "KLOB") {
               lines2skip += 1;
@@ -213 +216 @@
       continue;
     }
+    // RINEX version 2
     else {
       if (glonass()) {
@@ -226 +230 @@
     lines << line;
     if      (sys == 'G') {
-      for (int ii = 1; ii < 8; ii++) {
+      int nLines = 8;
+      if (navType == "CNAV") {
+        nLines += 1;
+      }
+      if (navType == "CNV2") {
+        nLines += 2;
+      }
+      for (int ii = 1; ii < nLines; ii++) {
         lines << stream->readLine();
       }
@@ -232 +243 @@
     }
     else if (sys == 'R') {
-      int num = 4;
+      int nLines = 4;
       if (version() >= 3.05) {
-        num += 1;
-      }
-      for (int ii = 1; ii < num; ii++) {
+        nLines += 1;
+      }
+      for (int ii = 1; ii < nLines; ii++) {
         lines << stream->readLine();
       }
@@ -248 +259 @@
     }
     else if (sys == 'J') {
-      for (int ii = 1; ii < 8; ii++) {
+      int nLines = 8;
+      if (navType == "CNAV") {
+        nLines += 1;
+      }
+      if (navType == "CNV2") {
+        nLines += 2;
+      }
+      for (int ii = 1; ii < nLines; ii++) {
         lines << stream->readLine();
       }
@@ -260 +278 @@
     }
     else if (sys == 'C') {
-      for (int ii = 1; ii < 8; ii++) {
+      int nLines = 8;
+      if (navType == "CNV1" ||
+          navType == "CNV2") {
+        nLines += 2;
+      }
+      if (navType == "CNV3") {
+        nLines += 1;
+      }
+      for (int ii = 1; ii < nLines; ii++) {
         lines << stream->readLine();
       }
@@ -266 +292 @@
     }
     else if (sys == 'I') {
-      for (int ii = 1; ii < 8; ii++) {
+      int nLines = 8;
+      if (navType == "L1NV") {
+        nLines += 1;
+      }
+      for (int ii = 1; ii < nLines; ii++) {
         lines << stream->readLine();
       }
@@ -272 +302 @@
     }
 
-    if (version() >= 4.0 && key == "EPH") {
-      if (eph->setEphType(ephType) != success) {
-        delete eph;
-        continue;
-      }
-    }
-
     if (eph) {
+      eph->setType(navType);
       _ephs.push_back(eph);
     }
+
   }
 }
@@ -363 +388 @@
   else {
     QString fmt;
-    t_eph::e_type sys = satSystem();
+    t_eph::e_system sys = satSystem();
     switch(sys) {
       case t_eph::GPS: