Changeset 5789 in ntrip for trunk

Timestamp:

Aug 4, 2014, 3:10:54 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/ephpool.cpp (modified) (2 diffs)
• PPP/options.cpp (modified) (1 diff)
• PPP/options.h (modified) (1 diff)
• ephemeris.cpp (modified) (1 diff)
• ephemeris.h (modified) (1 diff)

trunk/BNC/src/PPP/ephpool.cpp

@@ -42 +42 @@
 #include "ephpool.h"
 #include "ppp.h"
+#include "pppClient.h"
 
 using namespace BNC;
@@ -132 +133 @@
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
-    t_irc irc = eph->getCrd(tt, xc, vv);
+    t_irc irc = eph->getCrd(tt, xc, vv, OPT->corrRequired());
     if (irc == success) {
       if (eph->prn().system() == 'R') {

trunk/BNC/src/PPP/options.cpp

@@ -69 +69 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
+bool t_options::corrRequired() const {
+  return false;
+}
+
+// 
+//////////////////////////////////////////////////////////////////////////////
 bool t_options::useGlonass() const  {
   return (_lcGLONASS.size() > 0);

trunk/BNC/src/PPP/options.h

@@ -22 +22 @@
   bool dualFreqRequired() const;
   bool biasRequired() const;
+  bool corrRequired() const;
   bool useGlonass() const ;
   bool xyzAprRoverSet() const;

trunk/BNC/src/ephemeris.cpp

@@ -59 +59 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_eph::getCrd(const bncTime& tt, ColumnVector& xc,
-                    ColumnVector& vv, bool noCorr) const {
+                    ColumnVector& vv, bool useCorr) const {
   xc.ReSize(4);
   vv.ReSize(3);
   position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
-  if (!noCorr) {
+  if (useCorr) {
     throw "t_eph::getCrd: not yet implemented";
   }

trunk/BNC/src/ephemeris.h

@@ -58 +58 @@
 
   t_irc getCrd(const bncTime& tt, ColumnVector& xc,
-               ColumnVector& vv, bool noCorr = false) const;
+               ColumnVector& vv, bool useCorr) const;
   void setOrbCorr(const BNC::t_orbCorr* orbCorr);
   void setClkCorr(const BNC::t_clkCorr* clkCorr);