Changeset 336 in ntrip

Timestamp:

Nov 26, 2006, 10:53:08 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (2 diffs)
• bnccaster.h (modified) (1 diff)
• bncgetthread.cpp (modified) (1 diff)
• bncrinex.cpp (modified) (1 diff)
• bncrinex.h (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -116 +116 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncCaster::newObs(const QByteArray& staID, const QUrl& mountPoint,
-                       bool firstObs, Observation* obs) {
+                       bool firstObs, Observation* obs,
+                       const QByteArray& format) {
 
   QMutexLocker locker(&_mutex);
@@ -131 +132 @@
   // --------------------
   if (_rinexWriters.find(obs->StatID) == _rinexWriters.end()) {
-    _rinexWriters.insert(obs->StatID, new bncRinex(obs->StatID, mountPoint));
+    _rinexWriters.insert(obs->StatID, new bncRinex(obs->StatID, 
+                                                   mountPoint, format));
   }
   bncRinex* rnx = _rinexWriters.find(obs->StatID).value();

trunk/BNC/bnccaster.h

@@ -45 +45 @@
    int  numStations() const {return _staIDs.size();}
    void newObs(const QByteArray& staID, const QUrl& mountPoint,
-               bool firstObs, Observation* obs);
+               bool firstObs, Observation* obs, const QByteArray& format);
 
  signals:

trunk/BNC/bncgetthread.cpp

@@ -290 +290 @@
           emit newObs(_staID, *it);
           bool firstObs = (it == _decoder->_obsList.begin());
-          _global_caster->newObs(_staID, _mountPoint, firstObs, *it);
+          _global_caster->newObs(_staID, _mountPoint, firstObs, *it, _format);
         }
         _decoder->_obsList.clear();

trunk/BNC/bncrinex.cpp

@@ -61 +61 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncRinex::bncRinex(const char* StatID, const QUrl& mountPoint) {
+bncRinex::bncRinex(const char* StatID, const QUrl& mountPoint, 
+                   const QByteArray& format) {
   _statID        = StatID;
-  _mountPoint = mountPoint;
+  _mountPoint    = mountPoint;
+  _format        = format;
   _headerWritten = false;
 

trunk/BNC/bncrinex.h

@@ -38 +38 @@
 class bncRinex {
  public:
-   bncRinex(const char* StatID, const QUrl& mountPoint);
+   bncRinex(const char* StatID, const QUrl& mountPoint, 
+            const QByteArray& format);
    ~bncRinex();
    void deepCopy(const Observation* obs);
@@ -61 +62 @@
    QString             _userName;
    QString             _sklName;
+   QByteArray          _format;
 };