Changeset 6227 in ntrip

Timestamp:

Oct 11, 2014, 3:41:05 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

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

trunk/BNC/src/bncrinex.cpp

@@ -314 +314 @@
 // Write RINEX Header
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::writeHeader(const QByteArray& format, 
-                           const QDateTime& datTimNom) {
+void bncRinex::writeHeader(const QByteArray& format, const bncTime& firstObsTime) {
 
   bncSettings settings;
@@ -321 +320 @@
   // Open the Output File
   // --------------------
+  QDateTime datTimNom  = dateAndTimeFromGPSweek(firstObsTime.gpsw(), 
+                                                floor(firstObsTime.gpssec()+0.5));
   resolveFileName(datTimNom);
 
@@ -366 +367 @@
   txtMap["COMMENT"] = _addComments.join("\\n");
 
+  _header.setStartTime(firstObsTime);
   _header.write(&outHlp, &txtMap);
 
@@ -408 +410 @@
   // -------------
   const t_satObs& fObs = obsList.first();
-  QDateTime datTim     = dateAndTimeFromGPSweek(fObs._time.gpsw(), fObs._time.gpssec());
   QDateTime datTimNom  = dateAndTimeFromGPSweek(fObs._time.gpsw(), floor(fObs._time.gpssec()+0.5));
 
@@ -421 +422 @@
   // ------------------
   if (!_headerWritten) {
-    _header.setStartTime(fObs._time);
-    writeHeader(format, datTimNom);
+    writeHeader(format, fObs._time);
   }
 

trunk/BNC/src/bncrinex.h

@@ -53 +53 @@
    void resolveFileName(const QDateTime& datTim);
    bool readSkeleton();
-   void writeHeader(const QByteArray& format, const QDateTime& datTimNom);
+   void writeHeader(const QByteArray& format, const bncTime& firstObsTime);
    void closeFile();
    t_irc downloadSkeleton();