Changeset 278 in ntrip for trunk

Timestamp:

Nov 8, 2006, 11:58:57 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (3 diffs)
• bncgetthread.h (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -34 +34 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncGetThread::bncGetThread(const QUrl& mountPoint, const QByteArray& format) {
+bncGetThread::bncGetThread(const QUrl& mountPoint, 
+                           const QByteArray& format, int iMount) {
   _decoder    = 0;
   _mountPoint = mountPoint;
@@ -43 +44 @@
   _timeOut    = 20*1000;  // 20 seconds
   _nextSleep  =  1;       //  1 second
+  _iMount     = iMount;   // index in mountpoints array
 
   // Check name conflict
@@ -49 +51 @@
   QListIterator<QString> it(settings.value("mountPoints").toStringList());
   int num = 0;
-  int ind = 0;
+  int ind = -1;
   while (it.hasNext()) {
+    ++ind;
     QStringList hlp = it.next().split(" ");
     if (hlp.size() <= 1) continue;
     QUrl url(hlp[0]);
     if (_mountPoint.path() == url.path()) {
-      ++num;
-      if (_mountPoint.host() == url.host()) {
-        ind = num - 1;
-      }
-    }
-  }
-  if (num > 1) {
-    _staID = _staID.left(_staID.length()-1) + QString("%1").arg(ind).toAscii();
+      if (_iMount > ind) {
+        ++num;
+      }
+    }
+  }
+
+  if (num > 0) {
+    _staID = _staID.left(_staID.length()-1) + QString("%1").arg(num).toAscii();
   }    
 }

trunk/BNC/bncgetthread.h

@@ -13 +13 @@
 
  public:
-   bncGetThread(const QUrl& mountPoint, const QByteArray& format);
+   bncGetThread(const QUrl& mountPoint, 
+                const QByteArray& format, int iMount);
    ~bncGetThread();
 
@@ -42 +43 @@
    int         _timeOut;
    int         _nextSleep;
+   int         _iMount;
 };
 

trunk/BNC/bncmain.cpp

@@ -85 +85 @@
                 &app, SLOT(slotMessage(const QByteArray&)));
 
+    int iMount = -1;
     QListIterator<QString> it(settings.value("mountPoints").toStringList());
     while (it.hasNext()) {
+      ++iMount;
       QStringList hlp = it.next().split(" ");
       if (hlp.size() <= 1) continue;
       QUrl url(hlp[0]);
       QByteArray format = hlp[1].toAscii();
-      bncGetThread* getThread = new bncGetThread(url, format);
+      bncGetThread* getThread = new bncGetThread(url, format, iMount);
       app.connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
                   &app, SLOT(slotMessage(const QByteArray&)));

trunk/BNC/bncwindow.cpp

@@ -393 +393 @@
     QByteArray format = _mountPointsTable->item(iRow, 2)->text().toAscii();
 
-    bncGetThread* getThread = new bncGetThread(url, format);
+    bncGetThread* getThread = new bncGetThread(url, format, iRow);
 
     connect(getThread, SIGNAL(newMessage(const QByteArray&)),