Changeset 6377 in ntrip

Timestamp:

Dec 4, 2014, 3:52:53 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• ephemeris.cpp (modified) (1 diff)
• rinex/reqcedit.cpp (modified) (1 diff)
• rinex/rnxnavfile.cpp (modified) (1 diff)

trunk/BNC/src/ephemeris.cpp

@@ -573 +573 @@
       QString prnStr;
       in >> prnStr >> year >> month >> day >> hour >> min >> sec;
-      if (prnStr.at(0) == 'G') {
+      if      (prnStr.at(0) == 'G') {
         _prn.set('G', prnStr.mid(1).toInt());
+      }
+      else if (prnStr.at(0) == 'J') {
+        _prn.set('J', prnStr.mid(1).toInt());
       }
       else {

trunk/BNC/src/rinex/reqcedit.cpp

@@ -515 +515 @@
         ephs.append(new t_ephGal(*dynamic_cast<t_ephGal*>(eph)));
       }
-    }
-  }
-}
+      else if (eph->type() == t_eph::QZSS) {
+        ephs.append(new t_ephGPS(*dynamic_cast<t_ephGPS*>(eph)));
+      }
+    }
+  }
+}

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -181 +181 @@
       }
       eph = new t_ephGal(version(), lines);
+    }
+    else if (prn[0] == 'J') {
+      for (int ii = 1; ii < 8; ii++) {
+        lines << stream->readLine();
+      }
+      eph = new t_ephGPS(version(), lines);
     }
     if (eph && eph->ok()) {