Changeset 5375 in ntrip for trunk

Timestamp:

Aug 30, 2013, 4:53:06 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM/GPSDecoder.cpp (modified) (2 diffs)
• bnccore.cpp (modified) (6 diffs)
• rinex/rnxnavfile.h (modified) (1 diff)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/RTCM/GPSDecoder.cpp

@@ -189 +189 @@
     }
     else if (rnxStr[2] == 'X') {
-      if (satSys == 'C') {
+      if (satSys == 'C' || satSys == 'E') {
         res += GNSSENTRY_TYPEC1;
       }
@@ -210 +210 @@
       res += GNSSENTRY_TYPEC2;
     }
-    else if (QString("IQ").indexOf(rnxStr[2]) != -1) {
+    else if (rnxStr[2] == 'I') {
+      if (satSys == 'C') {
+        res += GNSSENTRY_TYPEC1;  // Compass: RINEX 3.01 "2I" corresponds to "1I" RINEX 3.02
+      }
+      else {
+        res += GNSSENTRY_TYPEC2;
+      }
+    }
+    else if (rnxStr[2] == 'Q') {
       res += GNSSENTRY_TYPEC2;
     }

trunk/BNC/src/bnccore.cpp

@@ -49 +49 @@
 #include "bncversion.h" 
 #include "RTCM3/ephemeris.h" 
+#include "rinex/rnxobsfile.h" 
+#include "rinex/rnxnavfile.h" 
 
 #ifdef USE_COMBINATION
@@ -464 +466 @@
       if (! (appendFlagGPS & QIODevice::Append)) {
         QString line;
-        line.sprintf(
-          "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.10, "", "");
+        line.sprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
+                     t_rnxNavFile::defaultRnxNavVersion2, "", "");
         *_ephStreamGPS << line;
          
@@ -481 +483 @@
       if (! (appendFlagGlonass & QIODevice::Append)) {
         QString line;
-        line.sprintf(
-          "%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",2.10,"","");
+        line.sprintf("%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",
+                     t_rnxNavFile::defaultRnxNavVersion2, "", "");
         *_ephStreamGlonass << line;
         
@@ -507 +509 @@
   eph.set(ep);
 
-  QString strV2 = eph.toString(2.11);
-  QString strV3 = eph.toString(3.01);
+  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
+  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
 
   printOutput(printFile, _ephStreamGPS, strV2, strV3);
@@ -515 +517 @@
 // Print One Glonass Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID) {
+void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile, const QString& /* staID */) {
 
   t_ephGlo eph;
   eph.set(ep);
 
-  QString strV2 = eph.toString(2.11);
-  QString strV3 = eph.toString(3.01);
+  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
+  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
 
   //// beg test Dirk
@@ -538 +540 @@
   eph.set(ep);
 
-  QString strV2 = eph.toString(2.11);
-  QString strV3 = eph.toString(3.01);
+  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
+  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
 
   printOutput(printFile, _ephStreamGalileo, strV2, strV3);

trunk/BNC/src/rinex/rnxnavfile.h

@@ -39 +39 @@
  public:
   enum e_inpOut {input, output};
+  static const double defaultRnxNavVersion2 = 2.11;
+  static const double defaultRnxNavVersion3 = 3.01;
 
  private:

trunk/BNC/src/rinex/rnxobsfile.h

@@ -40 +40 @@
 class t_rnxObsHeader {
  public:
+  static const double defaultRnxObsVersion2 = 2.11;
+  static const double defaultRnxObsVersion3 = 3.02;
+
   t_rnxObsHeader();
   ~t_rnxObsHeader();