Changeset 760 in ntrip for trunk

Timestamp:

Mar 30, 2008, 6:25:06 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (2 diffs)
• bns.h (modified) (1 diff)
• bnseph.cpp (modified) (1 diff)
• bnseph.h (modified) (1 diff)
• bnswindow.cpp (modified) (3 diffs)
• bnswindow.h (modified) (2 diffs)

trunk/BNS/bns.cpp

@@ -24 +24 @@
 ////////////////////////////////////////////////////////////////////////////
 t_bns::t_bns(QObject* parent) : QThread(parent) {
+
   _bnseph = new t_bnseph(parent);
+
   connect(_bnseph, SIGNAL(newMessage(QByteArray)),
           this, SLOT(slotMessage(const QByteArray)));
+
+  connect(_bnseph, SIGNAL(error(QByteArray)),
+          this, SLOT(slotError(const QByteArray)));
 }
 
@@ -42 +47 @@
 }
 
+// Write a Program Message
+////////////////////////////////////////////////////////////////////////////
+void t_bns::slotError(const QByteArray msg) {
+  cerr << msg.data() << endl;
+  emit(error(msg));
+}
+
 // Start 
 ////////////////////////////////////////////////////////////////////////////

trunk/BNS/bns.h

@@ -16 +16 @@
  signals:
   void newMessage(const QByteArray msg);
+  void error(const QByteArray msg);
  
  private slots:
   void slotMessage(const QByteArray msg);
+  void slotError(const QByteArray msg);
 
  private:

trunk/BNS/bnseph.cpp

@@ -46 +46 @@
   _socket->connectToHost(host, port);
 
-  const int timeOut = 10*1000;  // 10 seconds
+  const int timeOut = 3*1000;  // 3 seconds
   if (!_socket->waitForConnected(timeOut)) {
-    emit(newMessage("bnseph::run Connect Timeout"));
-    delete _socket; _socket = 0;
-    return;
+    emit(error("bnseph::run Connect Timeout"));
   }
-
-  while (true) {
-    if (_socket->canReadLine()) {
-      QByteArray line = _socket->readLine();
-      emit(newMessage(line));
-    }
-    else {
-      _socket->waitForReadyRead(10);
+  else {
+    while (true) {
+      if (_socket->canReadLine()) {
+        QByteArray line = _socket->readLine();
+        emit(newMessage(line));
+      }
+      else {
+        _socket->waitForReadyRead(10);
+      }
     }
   }

trunk/BNS/bnseph.h

@@ -14 +14 @@
  signals:
   void newMessage(const QByteArray msg);
+  void error(const QByteArray msg);
  
  private:

trunk/BNS/bnswindow.cpp

@@ -280 +280 @@
 }  
 
+// Delete bns
+////////////////////////////////////////////////////////////////////////////
+void bnsWindow::deleteBns() {
+  _actStart->setEnabled(true);
+  _actStop->setEnabled(false);
+  delete _bns; 
+  _bns = 0;
+}  
+
+// Error in bns
+////////////////////////////////////////////////////////////////////////////
+void bnsWindow::slotError(const QByteArray msg) {
+  slotMessage(msg);
+  deleteBns();
+}  
+
 // Stop 
 ////////////////////////////////////////////////////////////////////////////
@@ -287 +303 @@
                                    QMessageBox::NoButton);
   if (iRet == QMessageBox::Yes) {
-    _actStart->setEnabled(true);
-    _actStop->setEnabled(false);
-    delete _bns; 
-    _bns = 0;
+    deleteBns();
   }
 }
@@ -303 +316 @@
 
   _bns = new t_bns(0);
+
   connect(_bns, SIGNAL(newMessage(QByteArray)),
           this, SLOT(slotMessage(const QByteArray)));
+
+  connect(_bns, SIGNAL(error(QByteArray)),
+          this, SLOT(slotError(const QByteArray)));
+
   _bns->start();
 }

trunk/BNS/bnswindow.h

@@ -23 +23 @@
  public slots:  
   void slotMessage(const QByteArray msg);
+  void slotError(const QByteArray msg);
 
  private slots:
@@ -39 +40 @@
   void CreateMenu();
   void AddToolbar();
+  void deleteBns();
 
   QMenu*     _menuHlp;