Changeset 6051 in ntrip for trunk/BNC

Timestamp:

Sep 6, 2014, 4:11:25 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP_free/pppClient.cpp (modified) (1 diff)
• PPP_free/pppClient.h (modified) (1 diff)
• bnccore.cpp (modified) (1 diff)
• src.pri (modified) (2 diffs)

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -49 +49 @@
 
 #include "pppClient.h"
-#include "pppEphPool.h"
-#include "pppObsPool.h"
 #include "bncconst.h"
 #include "bncutils.h"
-#include "pppStation.h"
 #include "bncantex.h"
-#include "pppFilter.h"
 
 using namespace BNC_PPP;

trunk/BNC/src/PPP_free/pppClient.h

@@ -29 +29 @@
 
  private:
-  void initOutput(t_output* output);
-  void finish(t_irc irc);
-  void clearObs();
-  t_irc prepareObs(const std::vector<t_satObs*>& satObs,
-                   std::vector<t_pppSatObs*>& obsVector, bncTime& epoTime);
-  t_irc cmpModel(t_pppStation* station, const ColumnVector& xyzc,
-                 std::vector<t_pppSatObs*>& obsVector);
-  t_irc cmpBancroft(const bncTime& epoTime, std::vector<t_pppSatObs*>& obsVector, 
-                    ColumnVector& xyzc, bool print);
-  double cmpOffGG(std::vector<t_pppSatObs*>& obsVector);
-
   std::ostringstream*       _log; 
   t_pppOptions*             _opt; 

trunk/BNC/src/bnccore.cpp

@@ -51 +51 @@
 #include "rinex/rnxobsfile.h" 
 #include "rinex/rnxnavfile.h" 
-#include "PPP/pppMain.h"
+#include "pppMain.h"
 
 #ifdef USE_COMBINATION

trunk/BNC/src/src.pri

@@ -117 +117 @@
 
 exists(PPPxx) {
+  INCLUDEPATH += PPP
   HEADERS += PPP/pppClient.h    PPP/pppObsPool.h   PPP/pppEphPool.h   \
              PPP/pppStation.h   PPP/pppFilter.h    PPP/pppParlist.h   \
@@ -125 +126 @@
 }
 else {
+  INCLUDEPATH += PPP_free
   HEADERS += PPP_free/pppClient.h
   SOURCES += PPP_free/pppClient.cpp