Changeset 2000 in ntrip

Timestamp:

Nov 21, 2009, 3:35:20 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (2 diffs)
• bncgetthread.cpp (modified) (5 diffs)
• bncgetthread.h (modified) (3 diffs)

trunk/BNC/bnccaster.cpp

@@ -47 +47 @@
 #include "bncutils.h"
 #include "bncsettings.h"
+#include "bncpppthread.h"
 #include "RTCM/GPSDecoder.h"
 
@@ -250 +251 @@
   _staIDs.push_back(getThread->staID());
   _threads.push_back(getThread);
+
+  bncPPPthread* PPPthread = getThread->PPPthread();
+  if (PPPthread) {
+    connect(this, SIGNAL(newEpochData(QList<p_obs>)),
+            PPPthread, SLOT(slotNewEpochData(QList<p_obs>)));
+    connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
+            PPPthread, SLOT(slotNewEphGPS(gpsephemeris)));
+    PPPthread->start();
+  }
 
   getThread->start();

trunk/BNC/bncgetthread.cpp

@@ -63 +63 @@
 #include "bncsettings.h"
 #include "latencychecker.h"
+#include "bncpppthread.h"
 
 #include "RTCM/RTCM2Decoder.h"
@@ -122 +123 @@
   _nextSleep     = 0;
   _rawOutFile    = 0;
+  _PPPthread     = 0;
 
   bncSettings settings;
@@ -289 +291 @@
     emit(newMessage(_staID + ": Get data in RTCM 2.x format", true));
     _decoder = new RTCM2Decoder(_staID.data());
+    _PPPthread = new bncPPPthread(_staID);
   }
   else if (_format.indexOf("RTCM_3") != -1 || _format.indexOf("RTCM3") != -1 ||
@@ -296 +299 @@
     connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)), 
             this, SIGNAL(newMessage(QByteArray,bool)));
+    _PPPthread = new bncPPPthread(_staID);
   }
   else if (_format.indexOf("RTIGS") != -1) {
     emit(newMessage(_staID + ": Get data in RTIGS format", true));
     _decoder = new RTIGSDecoder();
+    _PPPthread = new bncPPPthread(_staID);
   }
   else if (_format.indexOf("GPSS") != -1 || _format.indexOf("BNC") != -1) {
@@ -322 +327 @@
 ////////////////////////////////////////////////////////////////////////////
 bncGetThread::~bncGetThread() {
+
+  if (_PPPthread) {
+    _PPPthread->terminate();
+  }
 
   if (isRunning()) {

trunk/BNC/bncgetthread.h

@@ -39 +39 @@
 class QextSerialPort;
 class latencyChecker;
+class bncPPPthread;
 
 class bncGetThread : public QThread {
@@ -72 +73 @@
    QByteArray longitude() const {return _longitude;}
    QByteArray ntripVersion() const {return _ntripVersion;}
+   bncPPPthread* PPPthread() {return _PPPthread;}
 
  signals:
@@ -121 +123 @@
    t_serialNMEA    _serialNMEA;
    QMutex          _mutex;
+   bncPPPthread*   _PPPthread;
 };