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

Timestamp:

Aug 30, 2013, 5:14:22 PM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/reqcedit.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -44 +44 @@
 #include "bncsettings.h"
 #include "bncutils.h"
+#include "rnxobsfile.h"
+#include "rnxnavfile.h"
 
 using namespace std;
-
-const double rnxV2 = 2.11;
-const double rnxV3 = 3.01;
 
 // Constructor
@@ -65 +64 @@
   int version     = settings.value("reqcRnxVersion").toInt();
   if (version < 3) {
-    _rnxVersion = rnxV2;
+    _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion2;
   }
   else {
-    _rnxVersion = rnxV3;
+    _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion3;
   }
   _samplingRate   = settings.value("reqcSampling").toInt();
@@ -424 +423 @@
   outNavFile.setGlonass(haveGlonass);
 
-  if (haveGPS && haveGlonass) {
-    outNavFile.setVersion(rnxV3);
+  if ( (haveGPS && haveGlonass) || _rnxVersion >= 3.0) {
+    outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion3);
   }
   else {
-    outNavFile.setVersion(_rnxVersion);
+    outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion2);
   }