Changeset 6015 in ntrip


Ignore:
Timestamp:
Aug 20, 2014, 4:46:52 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppInclude.h

    r5877 r6015  
    122122};
    123123
    124 class t_frequency {
    125  public:
    126   enum type {dummy = 0, G1, G2, R1, R2, maxFr};
    127 
    128   static std::string toString(type tt) {
    129     if      (tt == G1) return "G1";
    130     else if (tt == G2) return "G2";
    131     else if (tt == R1) return "R1";
    132     else if (tt == R2) return "R2";
    133     return std::string();
    134   }
    135 };
    136 
    137124class t_lc {
    138125 public:
  • trunk/BNC/src/PPP/pppSatObs.cpp

    r5936 r6015  
    218218  // -------------------------------------------
    219219  if (PPP_CLIENT->antex()) {
    220     t_frequency::type frq1 = t_frequency::G1;
    221     t_frequency::type frq2 = t_frequency::G2;
    222     if (_prn.system() == 'R') {
    223       frq1 = t_frequency::R1;
    224       frq2 = t_frequency::R2;
    225     }
    226220    bool found;
    227     _model._antPco1 = PPP_CLIENT->antex()->rcvCorr(frq1, station->antName(),
    228                                                 _model._eleSat, found);
    229     _model._antPco2 = PPP_CLIENT->antex()->rcvCorr(frq2, station->antName(),
    230                                                 _model._eleSat, found);
     221    _model._antPco1 = PPP_CLIENT->antex()->rcvCorr(station->antName(), _model._eleSat, found);
     222    _model._antPco2 = _model._antPco1;
    231223  }
    232224
  • trunk/BNC/src/bncantex.cpp

    r5815 r6015  
    283283//
    284284////////////////////////////////////////////////////////////////////////////
    285 double bncAntex::rcvCorr(BNC_PPP::t_frequency::type /* frqType */, const std::string& antName,
    286                double eleSat, bool& found) const {
     285double bncAntex::rcvCorr(const std::string& antName, double eleSat, bool& found) const {
    287286  return pco(QString(antName.c_str()), eleSat, found);
    288287}
  • trunk/BNC/src/bncantex.h

    r5815 r6015  
    3131#include "bncconst.h"
    3232#include "bnctime.h"
    33 #include "PPP/pppInclude.h"
    3433
    3534class bncAntex {
     
    4140  void print() const;
    4241  double pco(const QString& antName, double eleSat, bool& found) const;
    43   double rcvCorr(BNC_PPP::t_frequency::type frqType, const std::string& antName,
    44                  double eleSat, bool& found) const;
     42  double rcvCorr(const std::string& antName, double eleSat, bool& found) const;
    4543  t_irc  satCoMcorrection(const QString& prn, double Mjd,
    4644                          const ColumnVector& xSat, ColumnVector& dx);
Note: See TracChangeset for help on using the changeset viewer.