Changeset 8351 in ntrip for branches/BNC_2.12/src/bncrinex.cpp

Timestamp:

May 18, 2018, 9:56:20 AM (6 years ago)

Author:

stuerze

Message:

individual satellite system will be considerred now during concatenation of ephemeris files

File:

• branches/BNC_2.12/src/bncrinex.cpp (modified) (9 diffs)

branches/BNC_2.12/src/bncrinex.cpp

@@ -94 +94 @@
   _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
 
-  _rnxV3filenames = settings.value("rnxV3filenames").toBool();
+  _rnxV3 = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked) ? true : false;
 }
 
@@ -209 +209 @@
 ////////////////////////////////////////////////////////////////////////////
 QString bncRinex::nextEpochStr(const QDateTime& datTim,
-                               const QString& intStr, bool rnxV3filenames,
+                               const QString& intStr, bool rnxV3,
                                QDateTime* nextEpoch) {
 
@@ -221 +221 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
     } else {
@@ -248 +248 @@
       }
     }
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
     }
@@ -254 +254 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
@@ -272 +272 @@
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
@@ -303 +303 @@
 
   QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(),
-                                _rnxV3filenames, &_nextCloseEpoch);
+                                _rnxV3, &_nextCloseEpoch);
 
   int statIDlength = _statID.size() -1;
@@ -335 +335 @@
   }
 
-  if (_rnxV3filenames) {
+  if (_rnxV3) {
     QString country;
     QString monNum = "0";
@@ -362 +362 @@
             "_MO" + // mixed OBS
             distStr +
-            ".rnx"; 
+            ".rnx";
   }
   else {