Changeset 5731 in ntrip for trunk/BNC/src/PPP/pppThread.cpp

Timestamp:

Jul 31, 2014, 4:16:10 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppThread.cpp (modified) (8 diffs)

trunk/BNC/src/PPP/pppThread.cpp

@@ -28 +28 @@
  * -------------------------------------------------------------------------
  *
- * Class:      t_pppThread
+ * Class:      t_pppThread, t_pppRun
  *
  * Purpose:    Single PPP Client (running in its own thread)
@@ -60 +60 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppThread::~t_pppThread() {
+  delete _pppRun;
   cout << "~t_pppThread" << endl;
 }
@@ -69 +70 @@
   cout << _opt._roverName << " run" << endl;
 
-  // Connect to BNC Signals
-  // ----------------------
+  _pppRun = new t_pppRun(_opt);
+  QThread::exec();
+
+  cout << _opt._roverName << " exit" << endl;
+}
+
+// Constructor
+////////////////////////////////////////////////////////////////////////////
+t_pppRun::t_pppRun(const t_options& opt) {
+  _opt = opt;
+
   if (BNC_CORE->caster()) {
     connect(BNC_CORE->caster(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
@@ -87 +97 @@
             this, SLOT(slotNewCorrections(QList<QString>)));
   }
- 
-  // Start processing loop
-  // ---------------------
-  QThread::exec();
+}
 
-  cout << _opt._roverName << " exit" << endl;
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+t_pppRun::~t_pppRun() {
+  cout << "~t_pppRun" << endl;
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_pppThread::slotNewEphGPS(gpsephemeris gpseph) {
+void t_pppRun::slotNewEphGPS(gpsephemeris gpseph) {
   QMutexLocker locker(&_mutex);
   cout << _opt._roverName << " slotNewEphGPS" << endl;
@@ -104 +114 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_pppThread::slotNewEphGlonass(glonassephemeris gloeph) {
+void t_pppRun::slotNewEphGlonass(glonassephemeris gloeph) {
   QMutexLocker locker(&_mutex);
   cout << _opt._roverName << " slotNewEphGlonass" << endl;
@@ -111 +121 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_pppThread::slotNewEphGalileo(galileoephemeris /* galeph */) {
+void t_pppRun::slotNewEphGalileo(galileoephemeris /* galeph */) {
   QMutexLocker locker(&_mutex);
   cout << _opt._roverName << " slotNewEphGalileo" << endl;
@@ -118 +128 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_pppThread::slotNewCorrections(QList<QString> corrList) {
+void t_pppRun::slotNewCorrections(QList<QString> corrList) {
   QMutexLocker locker(&_mutex);
   cout << _opt._roverName << " slotNewCorrections" << endl;
@@ -124 +134 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_pppThread::slotNewObs(QByteArray staID, QList<t_obs> obsList) {
+void t_pppRun::slotNewObs(QByteArray staID, QList<t_obs> obsList) {
   QMutexLocker locker(&_mutex);
   cout << _opt._roverName << " slotNewObs" << endl;