Changeset 9760 in ntrip for trunk/BNC/src/bnccore.cpp

Timestamp:

Jun 9, 2022, 5:10:10 PM (23 months ago)

Author:

stuerze

Message:

initial changes to consider RINEX Version 4 in future

File:

• trunk/BNC/src/bnccore.cpp (modified) (8 diffs)

trunk/BNC/src/bnccore.cpp

@@ -288 +288 @@
   if (_rinexVers == 0) {
 
-    if ( Qt::CheckState(settings.value("ephV2").toInt()) == Qt::Checked) {
-      _rinexVers = 2;
-    }
-    else {
-      _rinexVers = 3;
-    }
+    _rinexVers = settings.value("ephVersion").toInt();
 
     _ephPath = settings.value("ephPath").toString();
@@ -313 +308 @@
     QString ephFileNameGPS = _ephPath + "BRDC";
 
-    bool ephV2 = (_rinexVers == 2)? true : false;
-
     QString hlpStr = bncRinex::nextEpochStr(datTim,
-                         settings.value("ephIntr").toString(), ephV2);
-
-    if (_rinexVers == 3) {
+                         settings.value("ephIntr").toString(), _rinexVers);
+
+    if (_rinexVers > 2) {
       QString country = "WRD"; // WORLD
       QString monNum = "0";
@@ -359 +352 @@
     _ephStreamGPS->setDevice(_ephFileGPS);
 
-    if      (_rinexVers == 3) {
+    if      (_rinexVers > 2) {
       _ephFileGlonass   = _ephFileGPS;
       _ephStreamGlonass = _ephStreamGPS;
@@ -367 +360 @@
       _ephStreamSBAS    = _ephStreamGPS;
     }
-    else if (_rinexVers == 2) {
+    else {
       QString ephFileNameGlonass = _ephPath + "BRDC" +
           QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
@@ -388 +381 @@
     // Header - RINEX Version 3
     // ------------------------
-    if (_rinexVers == 3) {
+    if (_rinexVers > 2) {
       if ( ! (appendFlagGPS & QIODevice::Append)) {
         QString line = QString().asprintf("%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
@@ -415 +408 @@
     // Headers - RINEX Version 2
     // -------------------------
-    else if (_rinexVers == 2) {
+    else {
       if (! (appendFlagGPS & QIODevice::Append)) {
         QString line = QString().asprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
@@ -470 +463 @@
   QString strV2 = eph.toString(defaultRnxNavVersion2);
   QString strV3 = eph.toString(defaultRnxNavVersion3);
+  QString strV4 = eph.toString(defaultRnxNavVersion4);
 
   if     (_rinexVers == 2 && eph.type() == t_eph::GLONASS) {
-    printOutputEph(printFile, _ephStreamGlonass, strV2, strV3);
+    printOutputEph(printFile, _ephStreamGlonass, strV2, strV3, strV4);
   }
   else if(_rinexVers == 2 && eph.type() == t_eph::GPS)  {
-    printOutputEph(printFile, _ephStreamGPS, strV2, strV3);
+    printOutputEph(printFile, _ephStreamGPS, strV2, strV3, strV4);
   }
   else if (_rinexVers == 3) {
-    printOutputEph(printFile, _ephStreamGPS, strV2, strV3);
+    printOutputEph(printFile, _ephStreamGPS, strV2, strV3, strV4);
   }
 }
@@ -485 +479 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bncCore::printOutputEph(bool printFile, QTextStream* stream,
-                               const QString& strV2, const QString& strV3) {
+                               const QString& strV2, const QString& strV3,
+                               const QString& strV4) {
 
   // Output into file
   // ----------------
   if (printFile && stream) {
-    if (_rinexVers == 2) {
+    if     (_rinexVers == 2) {
       *stream << strV2.toLatin1();
     }
-    else {
+    else if (_rinexVers == 3) {
       *stream << strV3.toLatin1();
+    }
+    else if (_rinexVers == 4) {
+      *stream << strV4.toLatin1();
     }
     stream->flush();