Changeset 136 in ntrip

Timestamp:

Sep 8, 2006, 9:24:23 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (2 diffs)
• bnccaster.h (modified) (1 diff)
• bncgetthread.cpp (modified) (7 diffs)
• bncgetthread.h (modified) (2 diffs)
• bnctabledlg.cpp (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -58 +58 @@
   QSettings settings;
   _samplingRate = settings.value("rnxSampl").toInt();
+  _waitTime     = settings.value("waitTime").toInt();
+  if (_waitTime < 2) {
+    _waitTime = 2;
+  }
 }
 
@@ -109 +113 @@
   // Dump older epochs
   // -----------------
-  const long waitTime = 2;
-  dumpEpochs(_lastDumpSec + 1, newTime - waitTime);
-  _lastDumpSec = newTime - waitTime;
+  dumpEpochs(_lastDumpSec + 1, newTime - _waitTime);
+  _lastDumpSec = newTime - _waitTime;
 }
 

trunk/BNC/bnccaster.h

@@ -49 +49 @@
    QMap<QString, bncRinex*>       _rinexWriters;
    int                            _samplingRate;
+   long                           _waitTime;
 };
 

trunk/BNC/bncgetthread.cpp

@@ -28 +28 @@
 using namespace std;
 
-const int timeOut = 300*1000;
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
 bncGetThread::bncGetThread(const QUrl& mountPoint, const QByteArray& format) {
+  _decoder    = 0;
   _mountPoint = mountPoint;
   _staID      = mountPoint.path().mid(1).toAscii();
   _format     = format;
   _socket     = 0;
+  _timeOut    = 10*1000;  // 10 seconds
 }
 
@@ -43 +43 @@
 bncGetThread::~bncGetThread() {
   delete _socket;
+  delete _decoder;
 }
 
 // Connect to Caster, send the Request (static)
 ////////////////////////////////////////////////////////////////////////////
-QTcpSocket* bncGetThread::request(const QUrl& mountPoint, QString& msg) {
+QTcpSocket* bncGetThread::request(const QUrl& mountPoint, int timeOut, 
+                                  QString& msg) {
 
   // Connect the Socket
@@ -98 +100 @@
 }
 
-// Run
+// Init Run
 ////////////////////////////////////////////////////////////////////////////
-void bncGetThread::run() {
+void bncGetThread::initRun() {
 
   // Send the Request
@@ -106 +108 @@
   QString msg;
 
-  _socket = bncGetThread::request(_mountPoint, msg);
+  _socket = bncGetThread::request(_mountPoint, _timeOut, msg);
 
   emit(newMessage(msg.toAscii()));
@@ -116 +118 @@
   // Read Caster Response
   // --------------------
-  _socket->waitForReadyRead(timeOut);
+  _socket->waitForReadyRead(_timeOut);
   if (_socket->canReadLine()) {
     QString line = _socket->readLine();
@@ -131 +133 @@
   // Instantiate the filter
   // ----------------------
-  GPSDecoder* decoder;
+  if (!_decoder) { 
+    if      (_format.indexOf("RTCM_2") != -1) {
+      emit(newMessage("Get Data: " + _staID + " in RTCM 2.x format"));
+      _decoder = new RTCM('A',true);
+    }
+    else if (_format.indexOf("RTCM_3") != -1) {
+      emit(newMessage("Get Data: " + _staID + " in RTCM 3.0 format"));
+      _decoder = new rtcm3();
+    }
+    else if (_format.indexOf("RTIGS") != -1) {
+      emit(newMessage("Get Data: " + _staID + " in RTIGS format"));
+      _decoder = new rtigs();
+    }
+    else {
+      emit(newMessage(_staID + " Unknown data format " + _format));
+      return exit(1);
+    }
+  }
+}
 
-  if      (_format.indexOf("RTCM_2") != -1) {
-    emit(newMessage("Get Data: " + _staID + " in RTCM 2.x format"));
-    decoder = new RTCM('A',true);
-  }
-  else if (_format.indexOf("RTCM_3") != -1) {
-    emit(newMessage("Get Data: " + _staID + " in RTCM 3.0 format"));
-    decoder = new rtcm3();
-  }
-  else if (_format.indexOf("RTIGS") != -1) {
-    emit(newMessage("Get Data: " + _staID + " in RTIGS format"));
-    decoder = new rtigs();
-  }
-  else {
-    emit(newMessage(_staID + " Unknown data format " + _format));
-    return exit(1);
-  }
+// Run
+////////////////////////////////////////////////////////////////////////////
+void bncGetThread::run() {
+
+  initRun();
 
   // Read Incoming Data
   // ------------------
   while (true) {
-    _socket->waitForReadyRead(timeOut);
+    _socket->waitForReadyRead(_timeOut);
     qint64 nBytes = _socket->bytesAvailable();
     if (nBytes > 0) {
       char* data = new char[nBytes];
       _socket->read(data, nBytes);
-      decoder->Decode(data, nBytes);
+      _decoder->Decode(data, nBytes);
       delete data;
-      for (list<Observation*>::iterator it = decoder->m_lObsList.begin(); 
-           it != decoder->m_lObsList.end(); it++) {
+      for (list<Observation*>::iterator it = _decoder->m_lObsList.begin(); 
+           it != _decoder->m_lObsList.end(); it++) {
         emit newObs(_staID, *it);
       }
-      decoder->m_lObsList.clear();
+      _decoder->m_lObsList.clear();
     }
     else {
-      emit(newMessage("Data Timeout"));
-      return exit(1);
+      emit(newMessage("Data Timeout, reconnecting"));
+      tryReconnect();
     }
   }
-  delete decoder;
 }
 
@@ -183 +191 @@
 }
 
+// Try Re-Connect 
+////////////////////////////////////////////////////////////////////////////
+void bncGetThread::tryReconnect() {
+
+}

trunk/BNC/bncgetthread.h

@@ -16 +16 @@
 
    static QTcpSocket* bncGetThread::request(const QUrl& mountPoint,
-                                            QString& msg);
+                                            int timeOut, QString& msg);
 
    QByteArray staID() const {return _staID;}
@@ -28 +28 @@
    virtual void run();
  private:
+   void initRun();
+   void tryReconnect();
    void message(const QString&);
    void exit(int exitCode = 0);
+   GPSDecoder* _decoder;
    QTcpSocket* _socket;
    QUrl        _mountPoint;
    QByteArray  _staID;
    QByteArray  _format;
+   int         _timeOut;
 };
 

trunk/BNC/bnctabledlg.cpp

@@ -94 +94 @@
   // Send the Request
   // ----------------
+  const int timeOut = 10*1000;
   QString msg;
-  QTcpSocket* socket = bncGetThread::request(url, msg);
+  QTcpSocket* socket = bncGetThread::request(url, timeOut, msg);
 
   if (!socket) {
@@ -126 +127 @@
     }
     else {
-      const int timeOut = 10*1000;
       socket->waitForReadyRead(timeOut);
       if (socket->bytesAvailable() > 0) {