Changeset 8354 in ntrip for trunk/BNC/src/rinex

Timestamp:

May 18, 2018, 2:24:46 PM (7 years ago)

Author:

stuerze

Message:

inidividual satellite system will eb considerred during concatenation of epehemris files

Location:

trunk/BNC/src/rinex

Files:

• reqcedit.cpp (modified) (2 diffs)
• rnxnavfile.cpp (modified) (1 diff)
• rnxnavfile.h (modified) (3 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -561 +561 @@
   bool haveGPS     = false;
   bool haveGlonass = false;
+  QMap<t_eph::e_type, bool> haveGnss;
   for (int ii = 0; ii < _ephs.size(); ii++) {
     const t_eph* eph = _ephs[ii];
-    if      (eph->type() == t_eph::GPS) {
-      haveGPS = true;
-    }
-    else if (eph->type() == t_eph::GLONASS) {
-      haveGlonass = true;
+    switch (eph->type()) {
+      case t_eph::GPS:
+        haveGPS = true;
+        haveGnss[t_eph::GLONASS] = true;
+        break;
+      case t_eph::GLONASS:
+        haveGlonass = true;
+        haveGnss[t_eph::GPS] = true;
+        break;
+      case t_eph::Galileo:
+        haveGnss[t_eph::Galileo] = true;
+        break;
+      case t_eph::BDS:
+        haveGnss[t_eph::BDS] = true;
+        break;
+      case t_eph::QZSS:
+        haveGnss[t_eph::QZSS] = true;
+        break;
+      case t_eph::IRNSS:
+        haveGnss[t_eph::IRNSS] = true;
+        break;
+      case t_eph::SBAS:
+        haveGnss[t_eph::SBAS] = true;
+        break;
+      default:
+        haveGnss[t_eph::unknown] = true;
     }
   }
@@ -582 +604 @@
   else {
     outNavFile.setVersion(defaultRnxNavVersion2);
+  }
+
+  if (outNavFile.version() > 3.0) {
+    if (haveGnss.size() > 1) {
+      outNavFile.setGnssTypeV3(t_eph::unknown);
+    }
+    else if (haveGnss.size() == 1){
+      outNavFile.setGnssTypeV3(haveGnss.firstKey());
+    }
   }
 

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -294 +294 @@
   }
   else {
-    *_stream << QString("%1           N: GNSS NAV DATA    M: MIXED")
+    QString fmt;
+    t_eph::e_type sys = satSystem();
+    switch(sys) {
+      case t_eph::GPS:
+        fmt.append("%1           N: GNSS NAV DATA    G: GPS");
+        break;
+      case t_eph::GLONASS:
+        fmt.append("%1           N: GNSS NAV DATA    R: GLONASS");
+        break;
+      case t_eph::Galileo:
+        fmt.append("%1           N: GNSS NAV DATA    E: Galileo");
+        break;
+      case t_eph::QZSS:
+        fmt.append("%1           N: GNSS NAV DATA    J: QZSS");
+        break;
+      case t_eph::BDS:
+        fmt.append("%1           N: GNSS NAV DATA    C: BDS");
+        break;
+      case t_eph::IRNSS:
+        fmt.append("%1           N: GNSS NAV DATA    I: IRNSS");
+        break;
+      case t_eph::SBAS:
+        fmt.append("%1           N: GNSS NAV DATA    S: SBAS");
+        break;
+      case t_eph::unknown:
+        fmt.append("%1           N: GNSS NAV DATA    M: MIXED");
+        break;
+    }
+    *_stream << fmt
       .arg(_header._version, 9, 'f', 2)
       .leftJustified(60)

trunk/BNC/src/rinex/rnxnavfile.h

@@ -30 +30 @@
 #include "bncconst.h"
 #include "bnctime.h"
+#include "ephemeris.h"
 
 class t_pppOpt;
@@ -50 +51 @@
     double _version;
     bool   _glonass;
+    t_eph::e_type _satSys;
     QStringList _comments;
   };
@@ -62 +64 @@
   bool   glonass() const {return _header._glonass;}
   QStringList comments() const {return _header._comments;}
+  t_eph::e_type satSystem() const {return _header._satSys;}
   void   setGlonass(bool glo) {_header._glonass = glo;}
+  void   setGnssTypeV3(t_eph::e_type sys) {_header._satSys = sys;}
   void   writeHeader(const QMap<QString, QString>* txtMap = 0);
   void   writeEph(const t_eph* eph);