Changeset 9760 in ntrip for trunk/BNC/src/bncrinex.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/bncrinex.cpp (modified) (9 diffs)

trunk/BNC/src/bncrinex.cpp

@@ -116 +116 @@
   _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
 
-  _rnxV2 = (Qt::CheckState(settings.value("rnxV2").toInt()) == Qt::Checked) ? true : false;
+  _rnxVersion = settings.value("rnxVersion").toInt();
 }
 
@@ -250 +250 @@
 ////////////////////////////////////////////////////////////////////////////
 QString bncRinex::nextEpochStr(const QDateTime& datTim,
-                               const QString& intStr, bool rnxV2,
+                               const QString& intStr, int rnxVersion,
                                QDateTime* nextEpoch) {
 
@@ -262 +262 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (!rnxV2) {
+    if (rnxVersion > 2) {
       epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
     } else {
@@ -289 +289 @@
       }
     }
-    if (!rnxV2) {
+    if (rnxVersion > 2) {
       epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
     }
@@ -295 +295 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (!rnxV2) {
+    if (rnxVersion > 2) {
       epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
@@ -313 +313 @@
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (!rnxV2) {
+    if (rnxVersion > 2) {
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
@@ -344 +344 @@
 
   QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(),
-                                _rnxV2, &_nextCloseEpoch);
+                                _rnxVersion, &_nextCloseEpoch);
 
   int n = _statID.size();
@@ -390 +390 @@
   _localSklNameAlternative = sklPath + ID.toLower() + distStr + "." + sklExt;
 
-  if (!_rnxV2) {
+  if (_rnxVersion > 2) {
     QString country;
     QString monNum = "0";
@@ -438 +438 @@
   // Set RINEX Version
   // -----------------
-  int intHeaderVers = (Qt::CheckState(settings.value("rnxV2").toInt()) == Qt::Checked ? 2 : 3);
+  int intHeaderVers = settings.value("rnxVersion").toInt();
 
   // Open the Output File