Changeset 9158 in ntrip for trunk/BNC/src/bncrinex.cpp

Timestamp:

Oct 1, 2020, 3:19:04 PM (4 years ago)

Author:

stuerze

Message:

the default RINEX version in BNC is changed from version 2 to verision 3

File:

• trunk/BNC/src/bncrinex.cpp (modified) (9 diffs)

trunk/BNC/src/bncrinex.cpp

@@ -116 +116 @@
   _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
 
-  _rnxV3 = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked) ? true : false;
+  _rnxV2 = (Qt::CheckState(settings.value("rnxV2").toInt()) == Qt::Checked) ? true : false;
 }
 
@@ -249 +249 @@
 ////////////////////////////////////////////////////////////////////////////
 QString bncRinex::nextEpochStr(const QDateTime& datTim,
-                               const QString& intStr, bool rnxV3,
+                               const QString& intStr, bool rnxV2,
                                QDateTime* nextEpoch) {
 
@@ -261 +261 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
     } else {
@@ -288 +288 @@
       }
     }
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
     }
@@ -294 +294 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
@@ -312 +312 @@
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3) {
+    if (!rnxV2) {
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
@@ -343 +343 @@
 
   QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(),
-                                _rnxV3, &_nextCloseEpoch);
+                                _rnxV2, &_nextCloseEpoch);
 
   int n = _statID.size();
@@ -380 +380 @@
   }
 
-  if (_rnxV3) {
+  if (!_rnxV2) {
     QString country;
     QString monNum = "0";
@@ -428 +428 @@
   // Set RINEX Version
   // -----------------
-  int intHeaderVers = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked ? 3 : 2);
+  int intHeaderVers = (Qt::CheckState(settings.value("rnxV2").toInt()) == Qt::Checked ? 2 : 3);
 
   // Open the Output File