Changeset 4757 in ntrip

Timestamp:

Oct 22, 2012, 2:59:56 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTRover (added)
• RTRover/bncrtrover.cpp (added)
• RTRover/bncrtrover.h (added)
• RTRover/rtrover_interface.h (added)
• bncgetthread.cpp (modified) (5 diffs)
• bncgetthread.h (modified) (2 diffs)
• src.pro (modified) (1 diff)

trunk/BNC/src/bncgetthread.cpp

@@ -63 +63 @@
 #include "latencychecker.h"
 #include "bncpppclient.h"
-#ifdef PPP_DLL_INTERFACE
-#include "dllinterface.h"
+#ifdef RTROVER_INTERFACE
+#include "RTRover/bncrtrover.h"
 #endif
 #include "upload/bncrtnetdecoder.h"
@@ -133 +133 @@
   _nextSleep     = 0;
   _PPPclient     = 0;
-#ifdef PPP_DLL_INTERFACE
-  _dllInterface  = 0;
+#ifdef RTROVER_INTERFACE
+  _bncRtrover    = 0;
 #endif
   _miscMount     = settings.value("miscMount").toString();
@@ -345 +345 @@
     connect(_PPPclient, SIGNAL(newNMEAstr(QByteArray)), 
             this,       SIGNAL(newNMEAstr(QByteArray)));
-#ifdef PPP_DLL_INTERFACE
-    _dllInterface = new t_dllInterface();
+#ifdef RTROVER_INTERFACE
+    _bncRtrover = new t_bncRtrover();
 #endif
   }
@@ -379 +379 @@
   }
   delete _PPPclient;
-#ifdef PPP_DLL_INTERFACE
-    delete _dllInterface;
+#ifdef RTROVER_INTERFACE
+    delete _bncRtrover;
 #endif
   if (_rawFile) {
@@ -563 +563 @@
         if (_PPPclient && _staID == _PPPclient->staID()) {
           _PPPclient->putNewObs(obs);
-#ifdef PPP_DLL_INTERFACE
-          _dllInterface->putNewObs(obs);
+#ifdef RTROVER_INTERFACE
+          _bncRtrover->putNewObs(obs);
 #endif
         }

trunk/BNC/src/bncgetthread.h

@@ -41 +41 @@
 class latencyChecker;
 class bncPPPclient;
-#ifdef PPP_DLL_INTERFACE
-class t_dllInterface;
+#ifdef RTROVER_INTERFACE
+class t_bncRtrover;
 #endif
 
@@ -128 +128 @@
    bool                       _rawOutput;
    QMap<QString, long>        _prnLastEpo;
-#ifdef PPP_DLL_INTERFACE
-   t_dllInterface*            _dllInterface;
+#ifdef RTROVER_INTERFACE
+   t_bncRtrover*              _bncRtrover;
 #endif
    QMap<char, QVector<QString> > _rnxTypes;

trunk/BNC/src/src.pro

@@ -128 +128 @@
 }
 
+# Link to a 3rd-part library (test)
+# ---------------------------------
+# use_RTRover = true
+
+equals(use_RTRover, true) {
+  DEFINES += RTROVER_INTERFACE
+  HEADERS += RTRover/bncrtrover.h
+  SOURCES += RTRover/bncrtrover.cpp
+  LIBS    += -L RTRover -l RTRover
+}  
+