Changeset 2004 in ntrip for trunk/BNC

Timestamp:

Nov 21, 2009, 4:17:37 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (3 diffs)
• bncpppthread.cpp (modified) (5 diffs)

trunk/BNC/bncgetthread.cpp

@@ -284 +284 @@
   // _rawOutFile->open(QIODevice::WriteOnly);
 
+  // Initialize PPP Clinet?
+  // ----------------------
+  bool pppClient = false;
+  if (settings.value("pppMount").toString() == _staID) {
+    pppClient = true;
+  }
 
   // Instantiate the decoder
@@ -291 +297 @@
     emit(newMessage(_staID + ": Get data in RTCM 2.x format", true));
     _decoder = new RTCM2Decoder(_staID.data());
-    _PPPthread = new bncPPPthread(_staID);
+    if (pppClient) {
+      _PPPthread = new bncPPPthread(_staID);
+    }
   }
   else if (_format.indexOf("RTCM_3") != -1 || _format.indexOf("RTCM3") != -1 ||
@@ -299 +307 @@
     connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)), 
             this, SIGNAL(newMessage(QByteArray,bool)));
-    _PPPthread = new bncPPPthread(_staID);
+    if (pppClient) {
+      _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);
+    if (pppClient) {
+      _PPPthread = new bncPPPthread(_staID);
+    }
   }
   else if (_format.indexOf("GPSS") != -1 || _format.indexOf("BNC") != -1) {

trunk/BNC/bncpppthread.cpp

@@ -50 +50 @@
   _staID         = staID;
   _isToBeDeleted = false;
+  cout << "PPP Client " << _staID.data() << " constructor\n";
 }
 
@@ -58 +59 @@
     wait();
   }
+  cout << "PPP Client " << _staID.data() << " destructor\n";
 }
 
@@ -92 +94 @@
 void bncPPPthread::slotNewEpochData(QList<p_obs> obsList) {
   QMutexLocker locker(&_mutex);
+  cout << "PPP Client: new observations " << obsList.size() << endl;
 }
 
@@ -98 +101 @@
 void bncPPPthread::slotNewEphGPS(gpsephemeris gpseph) {
   QMutexLocker locker(&_mutex);
+  cout << "PPP Client: new ephemeris " << gpseph.satellite << endl;
 }
 
@@ -104 +108 @@
 void bncPPPthread::slotNewCorrections(QList<QString> corrList) {
   QMutexLocker locker(&_mutex);
+  cout << "PPP Client: new corrections " << corrList.size() << endl;
 }