Changeset 3525 in ntrip for trunk

Timestamp:

Dec 15, 2011, 10:00:46 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncrinex.cpp (modified) (6 diffs)
• bncrinex.h (modified) (3 diffs)

trunk/BNC/bncgetthread.cpp

@@ -141 +141 @@
   }
   else {
-    _rnx = new bncRinex(_staID, _mountPoint, _format, _latitude, 
-                        _longitude, _nmea, _ntripVersion);
+    _rnx = new bncRinex(_staID, _mountPoint, _latitude, _longitude, 
+                        _nmea, _ntripVersion);
   }
 
@@ -519 +519 @@
             _rnx->deepCopy(obs);
           }
-          _rnx->dumpEpoch(obsTime);
+          _rnx->dumpEpoch(_format, obsTime);
         }
       

trunk/BNC/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;
@@ -377 +375 @@
 // Write RINEX Header
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::writeHeader(const QDateTime& datTim, 
+void bncRinex::writeHeader(const QByteArray& format, const QDateTime& datTim, 
                            const QDateTime& datTimNom) {
 
@@ -439 +437 @@
                                 "    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 +509 @@
                                 "    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 +531 @@
 // 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 +568 @@
   // ------------------
   if (!_headerWritten) {
-    writeHeader(datTim, datTimNom);
+    writeHeader(format, datTim, datTimNom);
   }
 

trunk/BNC/bncrinex.h

@@ -38 +38 @@
  public:
    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); 
    ~bncRinex();
    void deepCopy(t_obs obs);
-   void dumpEpoch(long maxTime);
+   void dumpEpoch(const QByteArray& format, long maxTime);
    void setReconnectFlag(bool flag){_reconnectFlag = flag;}
    static QString nextEpochStr(const QDateTime& datTim,
@@ -64 +63 @@
    void resolveFileName(const QDateTime& datTim);
    void readSkeleton();
-   void writeHeader(const QDateTime& datTim, const QDateTime& datTimNom);
+   void writeHeader(const QByteArray& format, const QDateTime& datTim, 
+                    const QDateTime& datTimNom);
    void closeFile();
    t_irc downloadSkeleton();
@@ -80 +80 @@
    QString       _userName;
    QString       _sklName;
-   QByteArray    _format;
    QByteArray    _latitude;
    QByteArray    _longitude;