Changeset 267 in ntrip for trunk/BNC

Timestamp:

Nov 1, 2006, 12:03:08 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncrinex.cpp (modified) (4 diffs)
• bncrinex.h (modified) (1 diff)

trunk/BNC/bncrinex.cpp

@@ -148 +148 @@
     nextDate = datTim.date().addDays(1);
   }
-  QTime nextTime2 = nextTime.addMSecs(-100);
-  if (nextTime2 > nextTime) {
-    nextDate = nextDate.addDays(-1);
-  }
-  _nextCloseEpoch = QDateTime(nextDate, nextTime2);
+  _nextCloseEpoch = QDateTime(nextDate, nextTime);
 
   QString ID4 = _statID.left(4);
@@ -181 +177 @@
 // Write RINEX Header
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::writeHeader(const QDateTime& datTim) {
+void bncRinex::writeHeader(const QDateTime& datTim, 
+                           const QDateTime& datTimNom) {
 
   // Open the Output File
   // --------------------
-  resolveFileName(datTim);
+  resolveFileName(datTimNom);
 
   // Append to existing file and return
@@ -306 +303 @@
   // -------------
   Observation* fObs = *dumpList.begin();
-  QDateTime datTim = dateAndTimeFromGPSweek(fObs->GPSWeek, fObs->GPSWeeks);
+  QDateTime datTim    = dateAndTimeFromGPSweek(fObs->GPSWeek, fObs->GPSWeeks);
+  QDateTime datTimNom = dateAndTimeFromGPSweek(fObs->GPSWeek, 
+                                               floor(fObs->GPSWeeks+0.5));
 
   // Close the file
   // --------------
-  if (_nextCloseEpoch.isValid() && datTim >= _nextCloseEpoch) {
+  if (_nextCloseEpoch.isValid() && datTimNom >= _nextCloseEpoch) {
     closeFile();
     _headerWritten = false;
@@ -318 +317 @@
   // ------------------
   if (!_headerWritten) {
-    writeHeader(datTim);
+    writeHeader(datTim, datTimNom);
   }
 

trunk/BNC/bncrinex.h

@@ -22 +22 @@
    void resolveFileName(const QDateTime& datTim);
    void readSkeleton();
-   void writeHeader(const QDateTime& datTim);
+   void writeHeader(const QDateTime& datTim, const QDateTime& datTimNom);
    void closeFile();