Changeset 11192 in ntrip for trunk/BNC/src/rinex/reqcedit.cpp

Timestamp:

Nov 10, 2026, 12:13:23 PM (less than one hour ago)

Author:

stuerze

Message:

rinex version 4.02 now fully supported

File:

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

trunk/BNC/src/rinex/reqcedit.cpp

@@ -357 +357 @@
         addRnxConversionDetails(obsFile, txtMap);
       }
-      outObsFile.header().write(outObsFile.stream(), &txtMap);
+      // header with TIME OF FIRST/LAST OBS etc. of the written epochs
+      outObsFile.writeHeaderOnClose(txtMap);
     }
     t_rnxObsFile::t_rnxEpo* epo = 0;
     try {
+      // Events (epoch flags 2-6) of epochs not written (time window,
+      // sampling) are written with the next epoch; events with an epoch
+      // outside the time window are skipped
+      QList<t_rnxObsFile::t_rnxEvent> pendingEvents;
+      bool pendingPowerFail = false;
+      bool endReached       = false;
       while ( (epo = obsFile->nextEpoch()) != 0) {
+        collectEvents(epo->events, pendingEvents);
+        if (epo->flag == 1) {
+          pendingPowerFail = true;
+        }
         if (_begTime.valid() && epo->tt < _begTime) {
           continue;
         }
         if (_endTime.valid() && epo->tt > _endTime) {
+          endReached = true;
           break;
         }
 
-        int sec = int(nint(epo->tt.gpssec()*10));
-        if (sec % (int(_samplingRate)*10) == 0) {
+        // sampling in units of 0.1 sec (int(0.1)*10 would be zero)
+        int sec     = int(nint(epo->tt.gpssec()*10));
+        int sampl10 = int(nint(_samplingRate*10));
+        if (sampl10 <= 0 || sec % sampl10 == 0) {
           applyLLI(obsFile, epo);
           if (_minEle > 0.0) {
             applyElevationMask(obsFile, epo);
           }
+          epo->events = pendingEvents;
+          pendingEvents.clear();
+          if (pendingPowerFail) {
+            epo->flag = 1;
+            pendingPowerFail = false;
+          }
           outObsFile.writeEpoch(epo);
         }
@@ -380 +400 @@
           rememberLLI(obsFile, epo);
         }
+      }
+      // events after the last epoch of the file
+      if (!endReached) {
+        collectEvents(obsFile->pendingEvents(), pendingEvents);
+        outObsFile.writeEvents(pendingEvents);
       }
     }
@@ -400 +425 @@
       return;
     }
+  }
+}
+
+// Events to be written: events after the time window are skipped, events
+// before it only if they refer to their epoch (flag 5: external event,
+// flag 6: cycle slips); flags 2-4 change the state of the following data
+////////////////////////////////////////////////////////////////////////////
+void t_reqcEdit::collectEvents(const QList<t_rnxObsFile::t_rnxEvent>& events,
+                               QList<t_rnxObsFile::t_rnxEvent>& pendingEvents) const {
+  for (int ii = 0; ii < events.size(); ii++) {
+    const t_rnxObsFile::t_rnxEvent& event = events[ii];
+    if (event.epochValid && _endTime.valid() && event.tt > _endTime) {
+      continue;
+    }
+    if (event.epochValid && _begTime.valid() && event.tt < _begTime &&
+        (event.flag == 5 || event.flag == 6)) {
+      continue;
+    }
+    pendingEvents.append(event);
   }
 }