Changeset 256 in ntrip

Timestamp:

Oct 18, 2006, 3:56:17 PM (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) (4 diffs)
• bncrinex.h (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -85 +85 @@
 // New Observations
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::newObs(const QByteArray& staID, Observation* obs) {
+void bncCaster::newObs(const QByteArray& staID, const QUrl& mountPoint,
+                       Observation* obs) {
 
   QMutexLocker locker(&_mutex);
@@ -99 +100 @@
   // --------------------
   if (_rinexWriters.find(obs->StatID) == _rinexWriters.end()) {
-    _rinexWriters.insert(obs->StatID, new bncRinex(obs->StatID));
+    _rinexWriters.insert(obs->StatID, new bncRinex(obs->StatID, mountPoint));
   }
   bncRinex* rnx = _rinexWriters.find(obs->StatID).value();

trunk/BNC/bnccaster.h

@@ -20 +20 @@
    void addGetThread(bncGetThread* getThread);
    int  numStations() const {return _staIDs.size();}
-   void newObs(const QByteArray& staID, Observation* obs);
-
+   void newObs(const QByteArray& staID, const QUrl& mountPoint,
+               Observation* obs);
 
  signals:

trunk/BNC/bncgetthread.cpp

@@ -257 +257 @@
              it != _decoder->_obsList.end(); it++) {
           emit newObs(_staID, *it);
-          _global_caster->newObs(_staID, *it);
+          _global_caster->newObs(_staID, _mountPoint, *it);
         }
         _decoder->_obsList.clear();

trunk/BNC/bncrinex.cpp

@@ -35 +35 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncRinex::bncRinex(const char* StatID) {
+bncRinex::bncRinex(const char* StatID, const QUrl& mountPoint) {
   _statID        = StatID;
+  _mountPoint = mountPoint;
   _headerWritten = false;
   readSkeleton();
@@ -43 +44 @@
   _rnxScriptName = settings.value("rnxScript").toString();
   expandEnvVar(_rnxScriptName);
-
-  // Find the corresponding mountPoint
-  // ---------------------------------
-  QListIterator<QString> it(settings.value("mountPoints").toStringList());
-  while (it.hasNext()) {
-    QString hlp = it.next();
-    if (hlp.indexOf(_statID) != -1) {
-      QUrl url(hlp);
-      _mountPoint = url.host() + url.path();
-      break;
-    }
-  }
 
   _pgmName  = ((bncApp*)qApp)->bncVersion().leftJustified(20, ' ', true);
@@ -215 +204 @@
                                 "    hh    mm   ss.zzz0000").toAscii().data();
         _out << "                 TIME OF FIRST OBS"    << endl;
-        QString hlp = QString("STREAM %1").arg(_mountPoint)
+        QString hlp = QString("STREAM %1").arg(_mountPoint.host() + _mountPoint.path())
                              .leftJustified(60, ' ', true);
         _out << hlp.toAscii().data() << "COMMENT" << endl;
@@ -258 +247 @@
                                 "    hh    mm   ss.zzz0000").toAscii().data();
     _out << "                 "                                      << "TIME OF FIRST OBS"    << endl;
-    hlp = QString("STREAM %1").arg(_mountPoint)
+    hlp = QString("STREAM %1").arg(_mountPoint.host() + _mountPoint.path())
                                              .leftJustified(60, ' ', true);
     _out << hlp.toAscii().data() << "COMMENT" << endl;

trunk/BNC/bncrinex.h

@@ -14 +14 @@
 class bncRinex {
  public:
-   bncRinex(const char* StatID);
+   bncRinex(const char* StatID, const QUrl& mountPoint);
    ~bncRinex();
    void deepCopy(const Observation* obs);
@@ -34 +34 @@
    QString             _rnxScriptName;
    QProcess            _rnxScript;
-   QString             _mountPoint;
+   QUrl                _mountPoint;
    QString             _pgmName;
    QString             _userName;