Changeset 5818 in ntrip for trunk


Ignore:
Timestamp:
Aug 6, 2014, 12:28:26 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
6 edited

Legend:

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

    r5814 r5818  
    144144void t_pppClient::putBiases(const vector<t_satBiases*>& biases) {
    145145  for (unsigned ii = 0; ii < biases.size(); ii++) {
    146     _obsPool->putBiases(new t_satBias(*biases[ii]));
     146    _obsPool->putBiases(new t_pppSatBias(*biases[ii]));
    147147  }
    148148}
  • trunk/BNC/src/PPP/pppObsPool.cpp

    r5814 r5818  
    8484//
    8585/////////////////////////////////////////////////////////////////////////////
    86 void t_pppObsPool::putBiases(t_satBias* satBias) {
     86void t_pppObsPool::putBiases(t_pppSatBias* satBias) {
    8787  int iPrn = satBias->prn().toInt();
    8888  delete _satBiases[iPrn];
  • trunk/BNC/src/PPP/pppObsPool.h

    r5814 r5818  
    2727  t_pppObsPool();
    2828  ~t_pppObsPool();
    29   void putBiases(t_satBias* satBias);
     29  void putBiases(t_pppSatBias* satBias);
    3030
    3131  void putEpoch(const bncTime& epoTime, std::vector<t_satObs*>& obsVector);
    3232
    33   const t_satBias* satBias(const t_prn& prn) const { 
     33  const t_pppSatBias* satBias(const t_prn& prn) const { 
    3434    return _satBiases[prn.toInt()];
    3535  }
     
    4444
    4545 private:
    46   t_satBias*           _satBiases[t_prn::MAXPRN+1];
     46  t_pppSatBias*        _satBiases[t_prn::MAXPRN+1];
    4747  std::deque<t_epoch*> _epochs;
    4848};
  • trunk/BNC/src/PPP/pppSatBias.cpp

    r5814 r5818  
    2727 * -------------------------------------------------------------------------
    2828 *
    29  * Class:      t_pppMain
     29 * Class:      t_pppSatBias
    3030 *
    3131 * Purpose:    Satellite-specific biases
     
    4646// Constructor
    4747////////////////////////////////////////////////////////////////////////////
    48 t_satBias::t_satBias(const t_satBiases& satBiases) {
     48t_pppSatBias::t_pppSatBias(const t_satBiases& satBiases) {
    4949  _prn        = satBiases._prn;
    5050  _time       = satBiases._time;
     
    5252  _jumpCount  = satBiases._jumpCount;
    5353  for (unsigned ii = 0; ii < satBiases._biases.size(); ii++) {
    54     const t_bias& bias = satBiases._biases[ii];
    55     t_biasType biasType   = string(bias._rnxType3ch).substr(0,3);
    56     _biases[biasType]     = bias._value;
     54    const t_bias& bias  = satBiases._biases[ii];
     55    t_biasType biasType = string(bias._rnxType3ch).substr(0,3);
     56    _biases[biasType]   = bias._value;
    5757  }
    5858}
  • trunk/BNC/src/PPP/pppSatBias.h

    r5814 r5818  
    1010typedef std::string t_biasType;
    1111
    12 class t_satBias {
     12class t_pppSatBias {
    1313 public:
    14   t_satBias(const t_satBiases& satBiases);
    15   ~t_satBias() {}
     14  t_pppSatBias(const t_satBiases& satBiases);
     15  ~t_pppSatBias() {}
    1616  const t_prn& prn() const {return _prn;}
    1717  const std::map<t_biasType, double>& biases() const {return _biases;}
  • trunk/BNC/src/PPP/satobs.cpp

    r5814 r5818  
    245245  bool biasL1flg = false;
    246246  bool biasL2flg = false;
    247   const t_satBias* satBias = PPP_CLIENT->obsPool()->satBias(_prn);
     247  const t_pppSatBias* satBias = PPP_CLIENT->obsPool()->satBias(_prn);
    248248  if (satBias) {
    249249    map<t_biasType, double>::const_iterator it;
Note: See TracChangeset for help on using the changeset viewer.