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

Timestamp:

Jun 28, 2018, 12:47:06 PM (6 years ago)

Author:

stuerze

Message:

some changes to allow 10 Hz observation data generation with correct file names and observation data resampling (RINEX files, feed engine) and harmonization of all 3 applications

File:

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

trunk/BNC/src/bncrinex.cpp

@@ -90 +90 @@
   _userName = _userName.leftJustified(20, ' ', true);
 
-  _samplingRate = settings.value("rnxSampl").toInt();
+  _samplingRateMult10 = int(settings.value("rnxSampl").toString().split("sec").first().toDouble() * 10.0);
+
+  if      (settings.value("rnxSampl").toString() == "0.1 sec") {
+    _samplingRateStr = "_10Z";
+  }
+  else if (settings.value("rnxSampl").toString() == "1 sec") {
+    _samplingRateStr = "_01S";
+  }
+  else if (settings.value("rnxSampl").toString() == "5 sec") {
+    _samplingRateStr = "_05S";
+  }
+  else if (settings.value("rnxSampl").toString() == "10 sec") {
+    _samplingRateStr = "_10S";
+  }
+  else if (settings.value("rnxSampl").toString() == "15 sec") {
+    _samplingRateStr = "_15S";
+  }
+  else if (settings.value("rnxSampl").toString() == "30 sec") {
+    _samplingRateStr = "_30S";
+  }
+  else if (settings.value("rnxSampl").toString() == "60 sec") {
+    _samplingRateStr = "_01M";
+  }
 
   _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
@@ -348 +370 @@
       }
     }
-    int sampl = settings.value("rnxSampl").toString().mid(0,2).toInt();
-    if (!sampl)
-      sampl++;
+
     path += ID4 +
             QString("%1").arg(monNum, 1, 10) +
@@ -359 +379 @@
             QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
             hlpStr + // HMS_period
-            QString("_%1S").arg(sampl, 2, 10, QChar('0')) + // sampling rate
+            QString("%1").arg(_samplingRateStr) + // sampling rate
             "_MO" + // mixed OBS
             distStr +