Changeset 8398 in ntrip for branches/BNC_2.12/src/rinex

Timestamp:

Jun 28, 2018, 12:53:59 PM (7 years ago)

Author:

stuerze

Message:

some changes to allow RINEX file generation with correct version 3 file names, 10 Hz observation data processing and resampling (RINEX files, feed engine) and harmonization of all avalable sampling cases (RINEX files, feed engine, reqc edit)

Location:

branches/BNC_2.12/src/rinex

Files:

• reqcanalyze.cpp (modified) (1 diff)
• reqcedit.cpp (modified) (3 diffs)
• reqcedit.h (modified) (1 diff)

branches/BNC_2.12/src/rinex/reqcanalyze.cpp

@@ -819 +819 @@
         << "End Time           : " << _qcFile._endTime.datestr().c_str()           << ' '
                                    << _qcFile._endTime.timestr(1,'.').c_str()      << endl
-        << "Interval           : " << _qcFile._interval                            << endl;
+        << "Interval           : " << _qcFile._interval << " sec"                  << endl;
 
   // Number of systems

branches/BNC_2.12/src/rinex/reqcedit.cpp

@@ -69 +69 @@
     _rnxVersion = defaultRnxObsVersion3;
   }
-  _samplingRate   = settings.value("reqcSampling").toInt();
+  _samplingRate   = settings.value("reqcSampling").toString().split("sec").first().toDouble();
   _begTime        = bncTime(settings.value("reqcStartDateTime").toString().toAscii().data());
   _endTime        = bncTime(settings.value("reqcEndDateTime").toString().toAscii().data());
@@ -118 +118 @@
           << _rnxVersion << endl;
     *_log << QByteArray("Sampling").leftJustified(15) << ": "
-          << _samplingRate << endl;
+          << _samplingRate << " sec" << endl;
     *_log << QByteArray("Start time").leftJustified(15) << ": "
           << _begTime.datestr().c_str() << ' '
@@ -337 +337 @@
 
         int sec = int(nint(epo->tt.gpssec()*10));
-        if (_samplingRate == 0 || sec % (_samplingRate*10) == 0) {
+        if (sec % (int(_samplingRate)*10) == 0) {
           applyLLI(obsFile, epo);
           outObsFile.writeEpoch(epo);

branches/BNC_2.12/src/rinex/reqcedit.h

@@ -71 +71 @@
   QString                _outNavFileName;
   double                 _rnxVersion;
-  int                    _samplingRate;
+  double                 _samplingRate;
   bncTime                _begTime;
   bncTime                _endTime;