Changeset 5815 in ntrip


Ignore:
Timestamp:
Aug 6, 2014, 12:06:58 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncantex.cpp

    r5805 r5815  
    4545#include "PPP/pppModel.h"
    4646
    47 using namespace BNC;
    4847using namespace std;
    4948
     
    237236    sz /= sqrt(DotProduct(sz,sz));
    238237
    239     ColumnVector xSun = t_astro::Sun(Mjd);
     238    ColumnVector xSun = BNC_PPP::t_astro::Sun(Mjd);
    240239    xSun /= sqrt(DotProduct(xSun,xSun));
    241240 
     
    284283//
    285284////////////////////////////////////////////////////////////////////////////
    286 double bncAntex::rcvCorr(BNC::t_frequency::type /* frqType */, const std::string& antName,
     285double bncAntex::rcvCorr(BNC_PPP::t_frequency::type /* frqType */, const std::string& antName,
    287286               double eleSat, bool& found) const {
    288287  return pco(QString(antName.c_str()), eleSat, found);
  • trunk/BNC/src/bncantex.h

    r5813 r5815  
    4141  void print() const;
    4242  double pco(const QString& antName, double eleSat, bool& found) const;
    43   double rcvCorr(BNC::t_frequency::type frqType, const std::string& antName,
     43  double rcvCorr(BNC_PPP::t_frequency::type frqType, const std::string& antName,
    4444                 double eleSat, bool& found) const;
    4545  t_irc  satCoMcorrection(const QString& prn, double Mjd,
  • trunk/BNC/src/bncmodel.cpp

    r5808 r5815  
    5454#include "pppopt.h"
    5555
    56 using namespace BNC;
    5756using namespace std;
    5857
     
    188187  }
    189188
    190   _tides = new t_tides;
     189  _tides = new BNC_PPP::t_tides;
    191190
    192191  // Bancroft Coordinates
     
    346345  satData->rho = (satData->xx - xRec).norm_Frobenius();
    347346
    348   double tropDelay = t_tropo::delay_saast(xRec, satData->eleSat) +
     347  double tropDelay = BNC_PPP::t_tropo::delay_saast(xRec, satData->eleSat) +
    349348                     trp() / sin(satData->eleSat);
    350349
     
    613612    else if (par->type == bncParam::TROPO) {
    614613      ColumnVector xyz(3); xyz(1) = x(); xyz(2) = y(); xyz(3) = z();
    615       double aprTrp = t_tropo::delay_saast(xyz, M_PI/2.0);
     614      double aprTrp = BNC_PPP::t_tropo::delay_saast(xyz, M_PI/2.0);
    616615      strB << "\n    trp     = " << par->prn.toAscii().data()
    617616           << setw(7) << setprecision(3) << aprTrp << " "
     
    894893    ColumnVector sz = -rSat / rSat.norm_Frobenius();
    895894
    896     ColumnVector xSun = t_astro::Sun(Mjd);
     895    ColumnVector xSun = BNC_PPP::t_astro::Sun(Mjd);
    897896    xSun /= xSun.norm_Frobenius();
    898897
  • trunk/BNC/src/bncmodel.h

    r5808 r5815  
    3838class t_pppOpt;
    3939class bncPPPclient;
    40 namespace BNC {
     40namespace BNC_PPP {
    4141class t_tides;
    4242}
     
    161161  QStringList           _outlierGlo;
    162162  bncAntex*             _antex;
    163   BNC::t_tides*         _tides;
     163  BNC_PPP::t_tides*     _tides;
    164164};
    165165
  • trunk/BNC/src/bncwindow.cpp

    r5729 r5815  
    7575#include "PPP/pppMain.h"
    7676
    77 using namespace BNC;
    7877using namespace std;
    7978
     
    10099  _runningPostProcessingReqc = false;
    101100  _postProcessing            = 0;
    102   _pppMain                   = new t_pppMain();
     101  _pppMain                   = new BNC_PPP::t_pppMain();
    103102
    104103  _pppSPPComboBox     = 0; // necessary for enableStartStop()
  • trunk/BNC/src/bncwindow.h

    r5813 r5815  
    5757class t_postProcessing;
    5858
    59 namespace BNC {
     59namespace BNC_PPP {
    6060class t_pppMain;
    6161}
     
    278278
    279279    t_pppWidgets         _pppWidgets;
    280     BNC::t_pppMain*      _pppMain;
     280    BNC_PPP::t_pppMain*  _pppMain;
    281281};
    282282
  • trunk/BNC/src/ephemeris.cpp

    r5813 r5815  
    1414#include "PPP/pppInclude.h"
    1515
    16 using namespace BNC;
    1716using namespace std;
    1817
     
    4443//
    4544////////////////////////////////////////////////////////////////////////////
    46 void t_eph::setOrbCorr(const BNC::t_orbCorr* orbCorr) {
     45void t_eph::setOrbCorr(const BNC_PPP::t_orbCorr* orbCorr) {
    4746  delete _orbCorr;
    48   _orbCorr = new t_orbCorr(*orbCorr);
     47  _orbCorr = new BNC_PPP::t_orbCorr(*orbCorr);
    4948}
    5049
    5150//
    5251////////////////////////////////////////////////////////////////////////////
    53 void t_eph::setClkCorr(const BNC::t_clkCorr* clkCorr) {
     52void t_eph::setClkCorr(const BNC_PPP::t_clkCorr* clkCorr) {
    5453  delete _clkCorr;
    55   _clkCorr = new t_clkCorr(*clkCorr);
     54  _clkCorr = new BNC_PPP::t_clkCorr(*clkCorr);
    5655}
    5756
  • trunk/BNC/src/ephemeris.h

    r5789 r5815  
    1313}
    1414
    15 namespace BNC {
     15namespace BNC_PPP {
    1616  class t_orbCorr;
    1717  class t_clkCorr;
     
    5959  t_irc getCrd(const bncTime& tt, ColumnVector& xc,
    6060               ColumnVector& vv, bool useCorr) const;
    61   void setOrbCorr(const BNC::t_orbCorr* orbCorr);
    62   void setClkCorr(const BNC::t_clkCorr* clkCorr);
     61  void setOrbCorr(const BNC_PPP::t_orbCorr* orbCorr);
     62  void setClkCorr(const BNC_PPP::t_clkCorr* clkCorr);
    6363  virtual int slotNum() const {return 0;}
    6464
     
    7474  QDateTime       _receptDateTime;
    7575  bool            _ok;
    76   BNC::t_orbCorr* _orbCorr;
    77   BNC::t_clkCorr* _clkCorr;
     76  BNC_PPP::t_orbCorr* _orbCorr;
     77  BNC_PPP::t_clkCorr* _clkCorr;
    7878};
    7979
Note: See TracChangeset for help on using the changeset viewer.