Changeset 1179 in ntrip

Timestamp:

Oct 27, 2008, 6:04:35 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bnccaster.cpp

@@ -313 +313 @@
 // Reread configuration 
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::slotReadMountpoints() {
+void bncCaster::slotReadMountPoints() {
 
   QSettings settings;
@@ -394 +394 @@
   }
 
-  emit mountPointsRead();
+  emit mountPointsRead(_threads);
   emit( newMessage(QString("Table of Mountpoints (re-)read: new number = %1")
                             .arg(_threads.count()).toAscii()) );
@@ -407 +407 @@
   else {
     _confTimer = new QTimer();
-    connect(_confTimer, SIGNAL(timeout()), this, SLOT(slotReadMountpoints()));
+    connect(_confTimer, SIGNAL(timeout()), this, SLOT(slotReadMountPoints()));
 
     QTime currTime = currentDateAndTimeGPS().time();

trunk/BNC/bnccaster.h

@@ -45 +45 @@
  public slots:
    void newObs(QByteArray staID, bool firstObs, p_obs obs);
-   void slotReadMountpoints();
+   void slotReadMountPoints();
 
  signals:
-   void mountPointsRead();
+   void mountPointsRead(QList<bncGetThread*>);
    void getThreadErrors();   
    void newMessage(QByteArray msg);

trunk/BNC/bncmain.cpp

@@ -172 +172 @@
     // --------------------------------
     if (!fileInput) {
-      caster->slotReadMountpoints();
+      caster->slotReadMountPoints();
       if (caster->numStations() == 0) {
         return 0;

trunk/BNC/bncwindow.cpp

@@ -696 +696 @@
           this, SLOT(slotGetThreadErrors()));
 
-  connect (_caster, SIGNAL(mountPointsRead()), 
-           this, SLOT(slotMountPointsRead()));
-
-  _caster->slotReadMountpoints();
+  connect (_caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)), 
+           this, SLOT(slotMountPointsRead(QList<bncGetThread*>)));
+
+  _caster->slotReadMountPoints();
 
   ((bncApp*)qApp)->slotMessage("============ Start BNC ============");
@@ -802 +802 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotMountPointsRead() {
+void bncWindow::slotMountPointsRead(QList<bncGetThread*> threads) {
   populateMountPointsTable();
+  QListIterator<bncGetThread*> iTh(threads);
+  while (iTh.hasNext()) {
+    bncGetThread* thread = iTh.next();
+    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() ) {
+        ((bncTableItem*) _mountPointsTable->item(iRow, 6))->setGetThread(thread);
+        break;
+      }
+    }
+  }
 }
 

trunk/BNC/bncwindow.h

@@ -58 +58 @@
   
   public slots:  
-    void slotMountPointsRead();
+    void slotMountPointsRead(QList<bncGetThread*>);
 
   private slots: