Changeset 5766 in ntrip for trunk/BNC/src

Timestamp:

Aug 4, 2014, 8:55:22 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppThread.cpp (modified) (10 diffs)
• pppThread.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppThread.cpp ¶

@@ -61 +61 @@
 t_pppThread::~t_pppThread() {
   delete _pppRun;
-  cout << "~t_pppThread" << endl;
 }
 
@@ -67 +66 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_pppThread::run() {
-
-  cout << _opt->_roverName << " run" << endl;
-
   try {
     _pppRun = new t_pppRun(_opt);
@@ -75 +71 @@
   }
   catch (pppExcept exc) {
-    cout << exc.what() << endl;
+    emit newMessage(QByteArray(exc.what().c_str()), true);
   }
-  cout << _opt->_roverName << " exit" << endl;
 }
 
@@ -103 +98 @@
   }
   else {
-    cout << "t_pppRun: post-processing not yet implemented" << endl;
+    throw pppExcept("t_pppRun: post-processing not yet implemented");
   }
 }
@@ -110 +105 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppRun::~t_pppRun() {
-  ////  delete _pppClient;
-  cout << "~t_pppRun" << endl;
 }
 
@@ -118 +111 @@
 void t_pppRun::slotNewEphGPS(gpsephemeris gpseph) {
   QMutexLocker locker(&_mutex);
-  cout << _opt->_roverName << " slotNewEphGPS" << endl;
   t_ephGPS eph;
   eph.set(&gpseph);
@@ -128 +120 @@
 void t_pppRun::slotNewEphGlonass(glonassephemeris gloeph) {
   QMutexLocker locker(&_mutex);
-  cout << _opt->_roverName << " slotNewEphGlonass" << endl;
 }
   
@@ -135 +126 @@
 void t_pppRun::slotNewEphGalileo(galileoephemeris /* galeph */) {
   QMutexLocker locker(&_mutex);
-  cout << _opt->_roverName << " slotNewEphGalileo" << endl;
 }
 
@@ -142 +132 @@
 void t_pppRun::slotNewCorrections(QStringList corrList) {
   QMutexLocker locker(&_mutex);
-  cout << _opt->_roverName << " slotNewCorrections" << endl;
 }
 //
@@ -148 +137 @@
 void t_pppRun::slotNewObs(QByteArray staID, QList<t_obs> obsList) {
   QMutexLocker locker(&_mutex);
-  cout << _opt->_roverName << " slotNewObs" << endl;
+
+  QByteArray msg = "slotNewObs";
+  emit newMessage(msg, true);
 }
     

trunk/BNC/src/PPP/pppThread.h ¶

@@ -17 +17 @@
   ~t_pppRun();
 
+ signals:
+  void newMessage(QByteArray msg, bool showOnScreen);
+
  public slots:
   void slotNewEphGPS(gpsephemeris gpseph);
@@ -31 +34 @@
 
 class t_pppThread : public QThread {
+ Q_OBJECT
  public:
   t_pppThread(const t_options* opt);
   ~t_pppThread();
   virtual void run();
+
+ signals:
+  void newMessage(QByteArray msg, bool showOnScreen);
 
  private: