Changeset 267 in ntrip for trunk/BNC


Ignore:
Timestamp:
Nov 1, 2006, 12:03:08 PM (18 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk/BNC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bncrinex.cpp

    r266 r267  
    148148    nextDate = datTim.date().addDays(1);
    149149  }
    150   QTime nextTime2 = nextTime.addMSecs(-100);
    151   if (nextTime2 > nextTime) {
    152     nextDate = nextDate.addDays(-1);
    153   }
    154   _nextCloseEpoch = QDateTime(nextDate, nextTime2);
     150  _nextCloseEpoch = QDateTime(nextDate, nextTime);
    155151
    156152  QString ID4 = _statID.left(4);
     
    181177// Write RINEX Header
    182178////////////////////////////////////////////////////////////////////////////
    183 void bncRinex::writeHeader(const QDateTime& datTim) {
     179void bncRinex::writeHeader(const QDateTime& datTim,
     180                           const QDateTime& datTimNom) {
    184181
    185182  // Open the Output File
    186183  // --------------------
    187   resolveFileName(datTim);
     184  resolveFileName(datTimNom);
    188185
    189186  // Append to existing file and return
     
    306303  // -------------
    307304  Observation* fObs = *dumpList.begin();
    308   QDateTime datTim = dateAndTimeFromGPSweek(fObs->GPSWeek, fObs->GPSWeeks);
     305  QDateTime datTim    = dateAndTimeFromGPSweek(fObs->GPSWeek, fObs->GPSWeeks);
     306  QDateTime datTimNom = dateAndTimeFromGPSweek(fObs->GPSWeek,
     307                                               floor(fObs->GPSWeeks+0.5));
    309308
    310309  // Close the file
    311310  // --------------
    312   if (_nextCloseEpoch.isValid() && datTim >= _nextCloseEpoch) {
     311  if (_nextCloseEpoch.isValid() && datTimNom >= _nextCloseEpoch) {
    313312    closeFile();
    314313    _headerWritten = false;
     
    318317  // ------------------
    319318  if (!_headerWritten) {
    320     writeHeader(datTim);
     319    writeHeader(datTim, datTimNom);
    321320  }
    322321
  • trunk/BNC/bncrinex.h

    r256 r267  
    2222   void resolveFileName(const QDateTime& datTim);
    2323   void readSkeleton();
    24    void writeHeader(const QDateTime& datTim);
     24   void writeHeader(const QDateTime& datTim, const QDateTime& datTimNom);
    2525   void closeFile();
    2626
Note: See TracChangeset for help on using the changeset viewer.