Changeset 1556 in ntrip

Timestamp:

Feb 2, 2009, 12:53:29 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bnc.pro

@@ -2 +2 @@
 # Switch to debug configuration
 # -----------------------------
-CONFIG += debug
-CONFIG -= release
+CONFIG -= debug
+CONFIG += release
 
 DEFINES += NO_RTCM3_MAIN 

trunk/BNC/bnccaster.cpp

@@ -237 +237 @@
           this,      SLOT(newObs(QByteArray, bool, p_obs)));
 
-  connect(getThread, SIGNAL(error(QByteArray)), 
-          this, SLOT(slotGetThreadError(QByteArray)));
+  connect(getThread, SIGNAL(getThreadFinished(QByteArray)), 
+          this, SLOT(slotGetThreadFinished(QByteArray)));
 
   _staIDs.push_back(getThread->staID());
@@ -246 +246 @@
 }
 
-// Error in get thread
-////////////////////////////////////////////////////////////////////////////
-void bncCaster::slotGetThreadError(QByteArray staID) {
+// Get Thread destroyed
+////////////////////////////////////////////////////////////////////////////
+void bncCaster::slotGetThreadFinished(QByteArray staID) {
   QMutexLocker locker(&_mutex);
   _staIDs.removeAll(staID);
@@ -255 +255 @@
   if (_staIDs.size() == 0) {
     emit(newMessage("bncCaster: Last get thread terminated", true));
-    emit getThreadErrors();
+    emit getThreadsFinished();
   }
 }

trunk/BNC/bnccaster.h

@@ -49 +49 @@
  signals:
    void mountPointsRead(QList<bncGetThread*>);
-   void getThreadErrors();   
+   void getThreadsFinished();   
    void newMessage(QByteArray msg, bool showOnScreen);
 
@@ -55 +55 @@
    void slotNewConnection();
    void slotNewUConnection();
-   void slotGetThreadError(QByteArray staID);
+   void slotGetThreadFinished(QByteArray staID);
 
  private:

trunk/BNC/bncgetthread.cpp

@@ -292 +292 @@
   delete _rawOutFile;
   delete _serialPort;
+  emit getThreadFinished(_staID);
 }
 

trunk/BNC/bncgetthread.h

@@ -68 +68 @@
    void newAntCrd(QByteArray staID, double xx, double yy, double zz, QByteArray antType);
    void newMessage(QByteArray msg, bool showOnScreen);
+   void getThreadFinished(QByteArray staID);
 
  protected:

trunk/BNC/bncmain.cpp

@@ -137 +137 @@
     app.setPortCorr(settings.value("corrPort").toInt());
 
-    app.connect(caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
+    app.connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
   
     ((bncApp*)qApp)->slotMessage("============ Start BNC ============", true);

trunk/BNC/bncwindow.cpp

@@ -924 +924 @@
 // All get slots terminated
 ////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotGetThreadErrors() {
+void bncWindow::slotGetThreadsFinished() {
   ((bncApp*)qApp)->slotMessage("All Get Threads Terminated", true);
   if (!_actStop->isEnabled()) {
@@ -946 +946 @@
   ((bncApp*)qApp)->setPortCorr(_corrPortLineEdit->text().toInt());
 
-  connect(_caster, SIGNAL(getThreadErrors()), 
-          this, SLOT(slotGetThreadErrors()));
+  connect(_caster, SIGNAL(getThreadsFinished()), 
+          this, SLOT(slotGetThreadsFinished()));
 
   connect (_caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)), 

trunk/BNC/bncwindow.h

@@ -73 +73 @@
     void slotNewMountPoints(QStringList* mountPoints);
     void slotDeleteMountPoints();
-    void slotGetThreadErrors();
+    void slotGetThreadsFinished();
     void slotSelectionChanged();
     void slotWhatsThis();