Changeset 4010 in ntrip for trunk/BNC/rinex

Timestamp:

Apr 22, 2012, 12:29:32 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/rinex

Files:

• reqcedit.cpp (modified) (2 diffs)
• rnxnavfile.cpp (modified) (2 diffs)

trunk/BNC/rinex/reqcedit.cpp

@@ -56 +56 @@
   _navFileNames   = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
   _outNavFileName = settings.value("reqcOutNavFile").toString();
-  _rnxVersion     = settings.value("reqcRnxVersion").toDouble();
+  int version     = settings.value("reqcRnxVersion").toInt();
+  if (version < 3) {
+    _rnxVersion = 2.11;
+  }
+  else {
+    _rnxVersion = 3.01;
+  }
   _samplingRate   = settings.value("reqcSampling").toInt();
   _begTime        = bncTime(settings.value("reqcStartDateTime").toString().toAscii().data());
@@ -255 +261 @@
   for (int ii = 0; ii < _ephs.size(); ii++) {
     const t_eph* eph = _ephs[ii];
-    outNavFile.writeEph(eph);
-  }
-}
+    if (eph->type() == t_eph::GPS || _rnxVersion >= 3.0) {
+      outNavFile.writeEph(eph);
+    }
+  }
+}

trunk/BNC/rinex/rnxnavfile.cpp

@@ -42 +42 @@
 #include <newmatio.h>
 #include "rnxnavfile.h"
+#include "bncapp.h"
 #include "bncutils.h"
 #include "RTCM3/ephemeris.h"
@@ -239 +240 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxNavFile::writeHeader() {
-  *_stream << "Writing header ..." << endl;
+
+  bncApp* app = (bncApp*) qApp;
+
+  if (version() < 3.0) {
+    *_stream << QString("%1           Navigation data")
+      .arg(_header._version, 9, 'f', 2)
+      .leftJustified(60)
+             << "RINEX VERSION / TYPE\n";
+  }
+  else {
+    *_stream << QString("%1           Navigation data     Mixed")
+      .arg(_header._version, 9, 'f', 2)
+      .leftJustified(60)
+             << "RINEX VERSION / TYPE\n";
+  }
+
+  *_stream << QString("%1%2%3")
+    .arg(app->pgmName(), -20)
+    .arg(app->userName(), -20)
+    .arg(currentDateAndTimeGPS().date().toString("dd-MMM-yyyy"), -20)
+    .leftJustified(60)
+           << "PGM / RUN BY / DATE\n";
+
+  *_stream << QString()
+    .leftJustified(60)
+           << "END OF HEADER\n";
 }