Changeset 1178 in ntrip

Timestamp:

Oct 27, 2008, 5:54:25 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (3 diffs)
• bnccaster.h (modified) (1 diff)
• bncwindow.cpp (modified) (4 diffs)
• bncwindow.h (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -193 +193 @@
 
   getThread->start();
-
-  emit newGetThread(getThread);
 }
 
@@ -387 +385 @@
 
     if (!existFlg) {
-      emit deleteGetThread(thread);
       disconnect(thread, 0, 0, 0);
       _staIDs.removeAll(thread->staID());
@@ -397 +394 @@
   }
 
+  emit mountPointsRead();
   emit( newMessage(QString("Table of Mountpoints (re-)read: new number = %1")
                             .arg(_threads.count()).toAscii()) );

trunk/BNC/bnccaster.h

@@ -48 +48 @@
 
  signals:
-   void newGetThread(bncGetThread* thread);
-   void deleteGetThread(bncGetThread* thread);
+   void mountPointsRead();
    void getThreadErrors();   
    void newMessage(QByteArray msg);

trunk/BNC/bncwindow.cpp

@@ -249 +249 @@
   _mountPointsTable->setSelectionMode(QAbstractItemView::ExtendedSelection);
   _mountPointsTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-  QListIterator<QString> it(settings.value("mountPoints").toStringList());
-  if (!it.hasNext()) {
-    _actGetData->setEnabled(false);
-  }
-  int iRow = 0;
-  while (it.hasNext()) {
-    QStringList hlp = it.next().split(" ");
-    if (hlp.size() < 5) continue;
-    _mountPointsTable->insertRow(iRow);
-
-    QUrl    url(hlp[0]);
-
-    QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
-    QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
-    QString nmea(hlp[4]);
-
-    QTableWidgetItem* it;
-    it = new QTableWidgetItem(url.userInfo());
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 0, it);
-
-    it = new QTableWidgetItem(fullPath);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 1, it);
-
-    it = new QTableWidgetItem(format);
-    _mountPointsTable->setItem(iRow, 2, it);
-
-    if      (nmea == "yes") {
-    it = new QTableWidgetItem(latitude);
-    _mountPointsTable->setItem(iRow, 3, it);
-    it = new QTableWidgetItem(longitude);
-    _mountPointsTable->setItem(iRow, 4, it);
-    } else {
-    it = new QTableWidgetItem(latitude);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 3, it);
-    it = new QTableWidgetItem(longitude);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 4, it);
-    }
-
-    it = new QTableWidgetItem(nmea);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 5, it);
-
-    bncTableItem* bncIt = new bncTableItem();
-    bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 6, bncIt);
-
-    iRow++;
-  }
   _mountPointsTable->hideColumn(0);
-  _mountPointsTable->sortItems(1);
-
   connect(_mountPointsTable, SIGNAL(itemSelectionChanged()), 
           SLOT(slotSelectionChanged()));
+  populateMountPointsTable();
 
   _log = new QTextBrowser();
@@ -493 +440 @@
 bncWindow::~bncWindow() {
   delete _caster;
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::populateMountPointsTable() {
+
+  for (int iRow = _mountPointsTable->rowCount()-1; iRow >=0; iRow--) {
+    _mountPointsTable->removeRow(iRow);
+  }
+
+  QSettings settings;
+
+  QListIterator<QString> it(settings.value("mountPoints").toStringList());
+  if (!it.hasNext()) {
+    _actGetData->setEnabled(false);
+  }
+  int iRow = 0;
+  while (it.hasNext()) {
+    QStringList hlp = it.next().split(" ");
+    if (hlp.size() < 5) continue;
+    _mountPointsTable->insertRow(iRow);
+
+    QUrl    url(hlp[0]);
+
+    QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
+    QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
+    QString nmea(hlp[4]);
+
+    QTableWidgetItem* it;
+    it = new QTableWidgetItem(url.userInfo());
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 0, it);
+
+    it = new QTableWidgetItem(fullPath);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 1, it);
+
+    it = new QTableWidgetItem(format);
+    _mountPointsTable->setItem(iRow, 2, it);
+
+    if      (nmea == "yes") {
+    it = new QTableWidgetItem(latitude);
+    _mountPointsTable->setItem(iRow, 3, it);
+    it = new QTableWidgetItem(longitude);
+    _mountPointsTable->setItem(iRow, 4, it);
+    } else {
+    it = new QTableWidgetItem(latitude);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 3, it);
+    it = new QTableWidgetItem(longitude);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 4, it);
+    }
+
+    it = new QTableWidgetItem(nmea);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 5, it);
+
+    bncTableItem* bncIt = new bncTableItem();
+    bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 6, bncIt);
+
+    iRow++;
+  }
+
+  _mountPointsTable->sortItems(1);
 }
 
@@ -683 +696 @@
           this, SLOT(slotGetThreadErrors()));
 
-  connect (_caster, SIGNAL(newGetThread(bncGetThread*)),
-           this, SLOT(slotNewGetThread(bncGetThread*)));
-
-  connect (_caster, SIGNAL(deleteGetThread(bncGetThread*)),
-           this, SLOT(slotDeleteGetThread(bncGetThread*)));
+  connect (_caster, SIGNAL(mountPointsRead()), 
+           this, SLOT(slotMountPointsRead()));
 
   _caster->slotReadMountpoints();
@@ -792 +802 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotNewGetThread(bncGetThread* thread) {
-  for (int iRow = 0; iRow < _mountPointsTable->rowCount(); iRow++) {
-    QUrl url( "//" + _mountPointsTable->item(iRow, 0)->text() + 
-              "@"  + _mountPointsTable->item(iRow, 1)->text() );
-    if (url                                      == thread->mountPoint() &&
-        _mountPointsTable->item(iRow, 3)->text() == thread->latitude()   &&
-        _mountPointsTable->item(iRow, 4)->text() == thread->longitude() ) {
-
-      connect(thread, SIGNAL(newBytes(QByteArray, double)),
-              (bncTableItem*) _mountPointsTable->item(iRow, 6), 
-              SLOT(slotNewBytes(QByteArray, double)));
-      break;
-    }
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotDeleteGetThread(bncGetThread* thread) {
+void bncWindow::slotMountPointsRead() {
+  populateMountPointsTable();
 }
 

trunk/BNC/bncwindow.h

@@ -58 +58 @@
   
   public slots:  
-    void slotNewGetThread(bncGetThread* thread);
-    void slotDeleteGetThread(bncGetThread* thread);
+    void slotMountPointsRead();
 
   private slots:
@@ -81 +80 @@
 
   private:
+    void populateMountPointsTable();
+
     QMenu*     _menuHlp;
     QMenu*     _menuFile;