Changeset 10608 in ntrip for trunk/BNC/src/bncclockrinex.cpp

Timestamp:

Feb 13, 2025, 9:50:06 AM (12 months ago)

Author:

stuerze

Message:

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

File:

• trunk/BNC/src/bncclockrinex.cpp (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;