Changeset 4763 in ntrip for trunk

Timestamp:

Oct 23, 2012, 10:42:42 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

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

trunk/BNC/src/RTRover/bncrtrover.cpp

@@ -14 +14 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_bncRtrover::t_bncRtrover() {
-
-  bncSettings settings;
-
-  // Processed Station, Corrections Source
-  // -------------------------------------
-  _pppCorrMount = settings.value("pppCorrMount").toString();
-
-  // Define Input Options
-  // --------------------
-  rtrover_opt opt;
-  rtrover_setOptions(&opt);
-
-  // Connect to BNC Signals
-  // ----------------------
-  connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
-          this, SLOT(slotNewCorrections(QList<QString>)));
-
-  connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
-          this, SLOT(slotNewEphGPS(gpsephemeris)));
-
-  connect(((bncApp*)qApp), SIGNAL(newEphGlonass(glonassephemeris)),
-          this, SLOT(slotNewEphGlonass(glonassephemeris)));
-
-  connect(((bncApp*)qApp), SIGNAL(newEphGalileo(galileoephemeris)),
-          this, SLOT(slotNewEphGalileo(galileoephemeris)));
+t_bncRtrover::t_bncRtrover() : QThread(0) {
+
 }
 
@@ -51 +27 @@
   }
   rtrover_destroy();
+}
+
+// Run (virtual)
+////////////////////////////////////////////////////////////////////////////
+void t_bncRtrover::run() {
+  bncSettings settings;
+
+  // Processed Station, Corrections Source
+  // -------------------------------------
+  _pppCorrMount = settings.value("pppCorrMount").toString();
+
+  // Define Input Options
+  // --------------------
+  rtrover_opt opt;
+  rtrover_setOptions(&opt);
+
+  // Connect to BNC Signals
+  // ----------------------
+  connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
+          this, SLOT(slotNewCorrections(QList<QString>)));
+
+  connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
+          this, SLOT(slotNewEphGPS(gpsephemeris)));
+
+  connect(((bncApp*)qApp), SIGNAL(newEphGlonass(glonassephemeris)),
+          this, SLOT(slotNewEphGlonass(glonassephemeris)));
+
+  connect(((bncApp*)qApp), SIGNAL(newEphGalileo(galileoephemeris)),
+          this, SLOT(slotNewEphGalileo(galileoephemeris)));
 }
 
@@ -201 +206 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_bncRtrover::putNewObs(const t_obs& obsIn) {
+void t_bncRtrover::slotNewObs(QByteArray staID, bool firstObs, t_obs obsIn) {
   QMutexLocker locker(&_mutex);
 

trunk/BNC/src/RTRover/bncrtrover.h

@@ -7 +7 @@
 #include "bncephuser.h"
 
-class t_bncRtrover : QObject {
+class t_bncRtrover : public QThread {
  Q_OBJECT
 
@@ -13 +13 @@
   t_bncRtrover();
   ~t_bncRtrover();
-  void putNewObs(const t_obs& pp);
+  virtual void run();
 
  public slots:
@@ -20 +20 @@
   void slotNewEphGalileo(galileoephemeris galeph);
   void slotNewCorrections(QList<QString> corrList);
+  void slotNewObs(QByteArray staID, bool firstObs, t_obs obs);
 
  private:

trunk/BNC/src/bnccaster.cpp

@@ -52 +52 @@
 #include "bncsettings.h"
 #include "RTCM/GPSDecoder.h"
+#ifdef RTROVER_INTERFACE
+#  include "RTRover/bncrtrover.h"
+#endif
 
 using namespace std;
@@ -131 +134 @@
   _lastDumpSec  = 0; 
   _confInterval = -1;
+#ifdef RTROVER_INTERFACE
+    _bncRtrover = new t_bncRtrover();
+    _bncRtrover->start();
+#endif
 }
 
@@ -267 +274 @@
   connect(getThread, SIGNAL(newObs(QByteArray, bool, t_obs)),
           this,      SLOT(newObs(QByteArray, bool, t_obs)));
+
+#ifdef RTROVER_INTERFACE
+  connect(getThread, SIGNAL(newObs(QByteArray, bool, t_obs)),
+          _bncRtrover, SLOT(slotNewObs(QByteArray, bool, t_obs)));
+#endif
 
   connect(getThread, SIGNAL(getThreadFinished(QByteArray)), 

trunk/BNC/src/bnccaster.h

@@ -33 +33 @@
 
 class bncGetThread;
+#ifdef RTROVER_INTERFACE
+ class t_bncRtrover;
+#endif
 
 class bncCaster : public QObject {
@@ -81 +84 @@
    QMutex                   _mutex;
    int                      _confInterval;
+#ifdef RTROVER_INTERFACE
+   t_bncRtrover*            _bncRtrover;
+#endif
 };
 

trunk/BNC/src/bncgetthread.cpp

@@ -63 +63 @@
 #include "latencychecker.h"
 #include "bncpppclient.h"
-#ifdef RTROVER_INTERFACE
-#include "RTRover/bncrtrover.h"
-#endif
 #include "upload/bncrtnetdecoder.h"
 #include "RTCM/RTCM2Decoder.h"
@@ -133 +130 @@
   _nextSleep     = 0;
   _PPPclient     = 0;
-#ifdef RTROVER_INTERFACE
-  _bncRtrover    = 0;
-#endif
   _miscMount     = settings.value("miscMount").toString();
   _decoder   = 0;
@@ -345 +339 @@
     connect(_PPPclient, SIGNAL(newNMEAstr(QByteArray)), 
             this,       SIGNAL(newNMEAstr(QByteArray)));
-#ifdef RTROVER_INTERFACE
-    _bncRtrover = new t_bncRtrover();
-#endif
   }
 #endif
@@ -379 +370 @@
   }
   delete _PPPclient;
-#ifdef RTROVER_INTERFACE
-    delete _bncRtrover;
-#endif
   if (_rawFile) {
     QMapIterator<QString, GPSDecoder*> it(_decodersRaw);
@@ -563 +551 @@
         if (_PPPclient && _staID == _PPPclient->staID()) {
           _PPPclient->putNewObs(obs);
-#ifdef RTROVER_INTERFACE
-          _bncRtrover->putNewObs(obs);
-#endif
         }
 #endif

trunk/BNC/src/bncgetthread.h

@@ -41 +41 @@
 class latencyChecker;
 class bncPPPclient;
-#ifdef RTROVER_INTERFACE
-class t_bncRtrover;
-#endif
 
 class bncGetThread : public QThread {
@@ -128 +125 @@
    bool                       _rawOutput;
    QMap<QString, long>        _prnLastEpo;
-#ifdef RTROVER_INTERFACE
-   t_bncRtrover*              _bncRtrover;
-#endif
    QMap<char, QVector<QString> > _rnxTypes;
 };