Changeset 3571 in ntrip for branches/BNC_LM/bncrinex.cpp

Timestamp:

Dec 25, 2011, 7:27:03 PM (12 years ago)

Author:

mervart

Message:

 

File:

• branches/BNC_LM/bncrinex.cpp (modified) (7 diffs)

branches/BNC_LM/bncrinex.cpp

@@ -66 +66 @@
 ////////////////////////////////////////////////////////////////////////////
 bncRinex::bncRinex(const QByteArray& statID, const QUrl& mountPoint, 
-                   const QByteArray& format, const QByteArray& latitude,
-                   const QByteArray& longitude, const QByteArray& nmea,
-                   const QByteArray& ntripVersion) {
+                   const QByteArray& latitude, const QByteArray& longitude, 
+                   const QByteArray& nmea, const QByteArray& ntripVersion) {
 
   _statID        = statID;
   _mountPoint    = mountPoint;
-  _format        = format.left(6);
   _latitude      = latitude;
   _longitude     = longitude;
@@ -103 +101 @@
 
   _approxPos[0] = _approxPos[1] = _approxPos[2] = 0.0;
+
+  _samplingRate = settings.value("rnxSampl").toInt();
 }
 
@@ -377 +377 @@
 // Write RINEX Header
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::writeHeader(const QDateTime& datTim, 
+void bncRinex::writeHeader(const QByteArray& format, const QDateTime& datTim, 
                            const QDateTime& datTimNom) {
 
@@ -439 +439 @@
                                 "    hh    mm   ss.zzz0000").toAscii().data();
         _out << "     GPS         TIME OF FIRST OBS"    << endl;
-        QString hlp = (_format + QString(" %1").arg(_mountPoint.host() + 
+        QString hlp = (format.left(6) + QString(" %1").arg(_mountPoint.host() + 
                       _mountPoint.path())).leftJustified(60, ' ', true);
         _out << hlp.toAscii().data() << "COMMENT" << endl;
@@ -511 +511 @@
                                 "    hh    mm   ss.zzz0000").toAscii().data();
     _out << "     GPS         TIME OF FIRST OBS"    << endl;
-    QString hlp = (_format + QString(" %1").arg(_mountPoint.host() + 
+    QString hlp = (format.left(6) + QString(" %1").arg(_mountPoint.host() + 
           _mountPoint.path())).leftJustified(60, ' ', true);
     _out << hlp.toAscii().data() << "COMMENT" << endl;
@@ -533 +533 @@
 // Write One Epoch into the RINEX File
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::dumpEpoch(long maxTime) {
+void bncRinex::dumpEpoch(const QByteArray& format, long maxTime) {
 
   // Select observations older than maxTime
@@ -570 +570 @@
   // ------------------
   if (!_headerWritten) {
-    writeHeader(datTim, datTimNom);
+    writeHeader(format, datTim, datTimNom);
   }