Changeset 10608 in ntrip for trunk/BNC

Timestamp:

Feb 13, 2025, 9:50:06 AM (3 days ago)

Author:

stuerze

Message:

inclusion of the 24:00 epoch in orbit and clock product files

Location:

trunk/BNC/src

Files:

• bncclockrinex.cpp (modified) (1 diff)
• bncclockrinex.h (modified) (1 diff)
• bncoutf.cpp (modified) (2 diffs)
• bncoutf.h (modified) (1 diff)
• bncsp3.cpp (modified) (4 diffs)
• bncsp3.h (modified) (1 diff)

trunk/BNC/src/bncclockrinex.cpp

@@ -47 +47 @@
   if (reopen(GPSweek, GPSweeks) == success) {
 
-      QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks);
-      double sec = fmod(GPSweeks, 60.0);
+    bncTime epoTime(GPSweek, GPSweeks);
 
-      int numValues = 1;
-      if (clkRnxSig && clkRnxRate && clkRnxRateSig) {
-        numValues += 3;
-      }
-      if (clkRnxAcc && clkRnxAccSig) {
-        numValues += 2;
+    if (epoTime != _lastEpoTime) {
+
+      // print out epoch before
+      if (_lastEpoTime.valid()) {
+        _out << _oStr.str();
+        if (_lastEpoTime.daysec() != 0.0) {
+          _oStr.str(std::string());
+        }
       }
 
-      _out << "AS " << prn.toLatin1().data()
-           << datTim.toString("  yyyy MM dd hh mm").toLatin1().data()
-           << fixed      << setw(10) << setprecision(6)  << sec
-           << "  " << numValues << "   "
-           << fortranFormat(clkRnx, 19, 12).toLatin1().data();
+      _lastEpoTime = epoTime;
+    }
 
-      if (numValues >=2) {
-        _out << " " << fortranFormat(clkRnxSig, 19, 12).toLatin1().data() << endl;
-      }
-      if (numValues == 4) {
-        _out << fortranFormat(clkRnxRate, 19, 12).toLatin1().data() << " ";
-        _out << fortranFormat(clkRnxRateSig, 19, 12).toLatin1().data() << " ";
-      }
-      if (numValues == 6) {
-        _out << fortranFormat(clkRnxAcc, 19, 12).toLatin1().data() << " ";
-        _out << " " << fortranFormat(clkRnxAccSig, 19, 12).toLatin1().data();
-      }
-      _out << endl;
+    int numValues = 1;
+    if (clkRnxSig && clkRnxRate && clkRnxRateSig) {
+      numValues += 3;
+    }
+    if (clkRnxAcc && clkRnxAccSig) {
+      numValues += 2;
+    }
+
+    _oStr << "AS " << prn.toLatin1().data()
+         << "  " <<  epoTime.datestr(' ') << ' ' << epoTime.timestr(6, ' ')
+         << "  " << numValues << "   "
+         << fortranFormat(clkRnx, 19, 12).toLatin1().data();
+
+    if (numValues >=2) {
+      _oStr << " " << fortranFormat(clkRnxSig, 19, 12).toLatin1().data() << endl;
+    }
+    if (numValues == 4) {
+      _oStr << fortranFormat(clkRnxRate, 19, 12).toLatin1().data() << " ";
+      _oStr << fortranFormat(clkRnxRateSig, 19, 12).toLatin1().data() << " ";
+    }
+    if (numValues == 6) {
+      _oStr << fortranFormat(clkRnxAcc, 19, 12).toLatin1().data() << " ";
+      _oStr << " " << fortranFormat(clkRnxAccSig, 19, 12).toLatin1().data();
+    }
+    _oStr << endl;
 
     return success;

trunk/BNC/src/bncclockrinex.h

@@ -18 +18 @@
  private:
   virtual void writeHeader(const QDateTime& datTim);
+  std::ostringstream _oStr;
+  bncTime            _lastEpoTime;
 };
 

trunk/BNC/src/bncoutf.cpp

@@ -187 +187 @@
   QString newFileName = resolveFileName(GPSweek, datTim);
 
+  bool wait = false;
+  if (isProductFile() &&
+      datTim.time().hour()   == 0 &&
+      datTim.time().minute() == 0 &&
+      (datTim.time().second() == 0.0 ||  datTim.time().second() == _sampl)) {
+    wait = true;
+  }
+
   // Close the file
   // --------------
-  if (newFileName != _fName) {
+  if (newFileName != _fName && !wait) {
     closeFile();
     _headerWritten = false;
@@ -226 +234 @@
   return QString("%1").arg(_sklBaseName.left(3));
 }
+
+// Files with epoch 00:00:00 at begin and end
+////////////////////////////////////////////////////////////////////////////
+bool bncoutf::isProductFile() {
+ bool isProduct = false;
+
+ if (_extension.contains("SP3")) {
+   isProduct = true;
+ }
+ if (_extension.contains("CLK")) {
+   isProduct = true;
+ }
+
+  return isProduct;
+}
+
+

trunk/BNC/src/bncoutf.h

@@ -15 +15 @@
   t_irc write(int GPSweek, double GPSweeks, const QString& str);
   QString agencyFromFileName();
+  bool isProductFile();
  protected:
   virtual t_irc reopen(int GPSweek, double GPSweeks);

trunk/BNC/src/bncsp3.cpp

@@ -74 +74 @@
     if (epoTime != _lastEpoTime) {
 
-      // Check the sampling interval (print empty epochs)
-      // ------------------------------------------------
-      if (_lastEpoTime.valid() && _sampl > 0) {
-        for (bncTime ep = _lastEpoTime +_sampl; ep < epoTime; ep = ep +_sampl) {
-          _out << "\n*  " << ep.datestr(' ') << ' ' << ep.timestr(8, ' ');
+      // print out epoch before
+      if (_lastEpoTime.valid()) {
+        _out << _oStr.str();
+        if (_lastEpoTime.daysec() != 0.0) {
+          _oStr.str(std::string());
+        }
+        // Check the sampling interval (print empty epochs)
+        // ------------------------------------------------
+        if (_sampl > 0) {
+          for (bncTime ep = _lastEpoTime +_sampl; ep < epoTime; ep = ep +_sampl) {
+            _oStr << "\n*  " << ep.datestr(' ') << ' ' << ep.timestr(8, ' ');
+          }
         }
       }
@@ -84 +91 @@
       // Print the new epoch
       // -------------------
-      _out << "\n*  " << epoTime.datestr(' ') << ' ' << epoTime.timestr(8, ' ');
+      _oStr << "\n*  " << epoTime.datestr(' ') << ' ' << epoTime.timestr(8, ' ');
 
       _lastEpoTime = epoTime;
     }
 
-    _out << "\nP" << prn.toLatin1().data()
+    _oStr << "\nP" << prn.toLatin1().data()
          << setw(14) << setprecision(6) << xCoM(1) / 1000.0 // [km]
          << setw(14) << setprecision(6) << xCoM(2) / 1000.0 // [km]
@@ -96 +103 @@
 
     if (sp3ClkRate) {
-      _out << "\nV" << prn.toLatin1().data()
+      _oStr << "\nV" << prn.toLatin1().data()
            << setw(14) << setprecision(6) << v(1) * 10.0      // [dm/s]
            << setw(14) << setprecision(6) << v(2) * 10.0      // [dm/s]
@@ -177 +184 @@
        << "/*                                                          \n"
        << "/*                                                          \n"
-       << "/*                                                          \n";
+       << "/*                                                          ";
 }
 

trunk/BNC/src/bncsp3.h

@@ -56 +56 @@
   virtual void closeFile();
 
-  e_inpOut      _inpOut;
-  bncTime       _lastEpoTime;
-  std::ifstream _stream;
-  std::string   _lastLine;
-  t_sp3Epoch*   _currEpoch;
-  t_sp3Epoch*   _prevEpoch;
+  e_inpOut           _inpOut;
+  bncTime            _lastEpoTime;
+  std::ifstream      _stream;
+  std::string        _lastLine;
+  t_sp3Epoch*        _currEpoch;
+  t_sp3Epoch*        _prevEpoch;
+  std::ostringstream _oStr;
 };