Changeset 2035 in ntrip for trunk/BNC/bncgetthread.cpp

Timestamp:

Nov 26, 2009, 2:22:40 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncgetthread.cpp (modified) (8 diffs)

trunk/BNC/bncgetthread.cpp

@@ -63 +63 @@
 #include "bncsettings.h"
 #include "latencychecker.h"
-#include "bncpppthread.h"
+#include "bncpppclient.h"
 
 #include "RTCM/RTCM2Decoder.h"
@@ -123 +123 @@
   _nextSleep     = 0;
   _rawOutFile    = 0;
-  _PPPthread     = 0;
+  _PPPclient     = 0;
 
   bncSettings settings;
@@ -284 +284 @@
   // _rawOutFile->open(QIODevice::WriteOnly);
 
-  // Initialize PPP Clinet?
+  // Initialize PPP Client?
   // ----------------------
-  bool pppClient = false;
   if (settings.value("pppMount").toString() == _staID) {
-    pppClient = true;
+    _PPPclient = new bncPPPclient(_staID);
+    connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
+            _PPPclient, SLOT(slotNewEphGPS(gpsephemeris)));
+    connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
+            _PPPclient, SLOT(slotNewCorrections(QList<QString>)));
   }
 
@@ -297 +300 @@
     emit(newMessage(_staID + ": Get data in RTCM 2.x format", true));
     _decoder = new RTCM2Decoder(_staID.data());
-    if (pppClient) {
-      _PPPthread = new bncPPPthread(_staID);
-    }
   }
   else if (_format.indexOf("RTCM_3") != -1 || _format.indexOf("RTCM3") != -1 ||
@@ -307 +307 @@
     connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)), 
             this, SIGNAL(newMessage(QByteArray,bool)));
-    if (pppClient) {
-      _PPPthread = new bncPPPthread(_staID);
-    }
   }
   else if (_format.indexOf("RTIGS") != -1) {
     emit(newMessage(_staID + ": Get data in RTIGS format", true));
     _decoder = new RTIGSDecoder();
-    if (pppClient) {
-      _PPPthread = new bncPPPthread(_staID);
-    }
   }
   else if (_format.indexOf("GPSS") != -1 || _format.indexOf("BNC") != -1) {
@@ -333 +327 @@
   _latencyChecker = new latencyChecker(_staID);
 
-  if (_PPPthread) {
-    connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
-            _PPPthread, SLOT(slotNewEphGPS(gpsephemeris)));
-    connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
-            _PPPthread, SLOT(slotNewCorrections(QList<QString>)));
-    ////    _PPPthread->start();  // currently processing in the same thread
-  }
-
   msleep(100); //sleep 0.1 sec
 }
@@ -347 +333 @@
 ////////////////////////////////////////////////////////////////////////////
 bncGetThread::~bncGetThread() {
-
-  if (_PPPthread) {
-    _PPPthread->terminate();
-  }
-
   if (isRunning()) {
     wait();
   }
-
   if (_query) {
     _query->stop();
     _query->deleteLater();
   }
+  delete _PPPclient;
   delete _decoder;
   delete _rnx;
@@ -501 +482 @@
         // PPP Client
         // ----------
-        if (_PPPthread) {
-          _PPPthread->putNewObs(obs);
+        if (_PPPclient) {
+          _PPPclient->putNewObs(obs);
         }