Changeset 5789 in ntrip for trunk


Ignore:
Timestamp:
Aug 4, 2014, 3:10:54 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/ephpool.cpp

    r5776 r5789  
    4242#include "ephpool.h"
    4343#include "ppp.h"
     44#include "pppClient.h"
    4445
    4546using namespace BNC;
     
    132133  for (unsigned ii = 0; ii < _ephs.size(); ii++) {
    133134    t_eph* eph = _ephs[ii];
    134     t_irc irc = eph->getCrd(tt, xc, vv);
     135    t_irc irc = eph->getCrd(tt, xc, vv, OPT->corrRequired());
    135136    if (irc == success) {
    136137      if (eph->prn().system() == 'R') {
  • trunk/BNC/src/PPP/options.cpp

    r5770 r5789  
    6969//
    7070//////////////////////////////////////////////////////////////////////////////
     71bool t_options::corrRequired() const {
     72  return false;
     73}
     74
     75//
     76//////////////////////////////////////////////////////////////////////////////
    7177bool t_options::useGlonass() const  {
    7278  return (_lcGLONASS.size() > 0);
  • trunk/BNC/src/PPP/options.h

    r5757 r5789  
    2222  bool dualFreqRequired() const;
    2323  bool biasRequired() const;
     24  bool corrRequired() const;
    2425  bool useGlonass() const ;
    2526  bool xyzAprRoverSet() const;
  • trunk/BNC/src/ephemeris.cpp

    r5776 r5789  
    5959////////////////////////////////////////////////////////////////////////////
    6060t_irc t_eph::getCrd(const bncTime& tt, ColumnVector& xc,
    61                     ColumnVector& vv, bool noCorr) const {
     61                    ColumnVector& vv, bool useCorr) const {
    6262  xc.ReSize(4);
    6363  vv.ReSize(3);
    6464  position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
    65   if (!noCorr) {
     65  if (useCorr) {
    6666    throw "t_eph::getCrd: not yet implemented";
    6767  }
  • trunk/BNC/src/ephemeris.h

    r5776 r5789  
    5858
    5959  t_irc getCrd(const bncTime& tt, ColumnVector& xc,
    60                ColumnVector& vv, bool noCorr = false) const;
     60               ColumnVector& vv, bool useCorr) const;
    6161  void setOrbCorr(const BNC::t_orbCorr* orbCorr);
    6262  void setClkCorr(const BNC::t_clkCorr* clkCorr);
Note: See TracChangeset for help on using the changeset viewer.