Changeset 6600 in ntrip


Ignore:
Timestamp:
Feb 20, 2015, 9:23:22 AM (7 years ago)
Author:
stuerze
Message:

complete renaming Compass to BDS

Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/ephEncoder.cpp

    r6550 r6600  
    326326}
    327327
    328 int t_ephEncoder::RTCM3(const t_ephCompass& /* eph */, unsigned char* /* buffer */) {
     328int t_ephEncoder::RTCM3(const t_ephBDS& /* eph */, unsigned char* /* buffer */) {
    329329
    330330  return 0;
  • trunk/BNC/src/RTCM3/ephEncoder.h

    r6403 r6600  
    66class t_ephEncoder {
    77 public:
    8   static int RTCM3(const t_ephGPS&     eph, unsigned char *);
    9   static int RTCM3(const t_ephGlo&     eph, unsigned char *);
    10   static int RTCM3(const t_ephGal&     eph, unsigned char *);
    11   static int RTCM3(const t_ephSBAS&    eph, unsigned char *);
    12   static int RTCM3(const t_ephCompass& eph, unsigned char *);
     8  static int RTCM3(const t_ephGPS&  eph, unsigned char *);
     9  static int RTCM3(const t_ephGlo&  eph, unsigned char *);
     10  static int RTCM3(const t_ephGal&  eph, unsigned char *);
     11  static int RTCM3(const t_ephSBAS& eph, unsigned char *);
     12  static int RTCM3(const t_ephBDS& eph, unsigned char *);
    1313};
    1414
  • trunk/BNC/src/ephemeris.cpp

    r6556 r6600  
    13251325// Constructor
    13261326//////////////////////////////////////////////////////////////////////////////
    1327 t_ephCompass::t_ephCompass(float rnxVersion, const QStringList& lines) {
     1327t_ephBDS::t_ephBDS(float rnxVersion, const QStringList& lines) {
    13281328
    13291329  const int nLines = 8;
     
    14751475// Constructor
    14761476//////////////////////////////////////////////////////////////////////////////
    1477 t_irc t_ephCompass::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
     1477t_irc t_ephBDS::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
    14781478
    14791479  if (_checkState == bad) {
     
    16051605// RINEX Format String
    16061606//////////////////////////////////////////////////////////////////////////////
    1607 QString t_ephCompass::toString(double version) const {
     1607QString t_ephBDS::toString(double version) const {
    16081608
    16091609  QString rnxStr = rinexDateStr(_TOC_bdt, _prn, version);
  • trunk/BNC/src/ephemeris.h

    r6536 r6600  
    239239};
    240240
    241 class t_ephCompass : public t_eph {
    242  friend class t_ephEncoder;
    243  public:
    244   t_ephCompass() {}
    245   t_ephCompass(float rnxVersion, const QStringList& lines);
    246   virtual ~t_ephCompass() {}
    247 
    248   // void set(const compassephemeris* ee);
     241class t_ephBDS : public t_eph {
     242 friend class t_ephEncoder;
     243 public:
     244 t_ephBDS() {}
     245 t_ephBDS(float rnxVersion, const QStringList& lines);
     246  virtual ~t_ephBDS() {}
     247
     248  void set(const bdsephemeris* ee);
    249249  virtual e_type  type() const {return t_eph::Compass;}
    250250  virtual int     IOD() const {return _AODC;}
  • trunk/BNC/src/rinex/reqcedit.cpp

    r6537 r6600  
    522522      }
    523523      else if (eph->type() == t_eph::Compass) {
    524         ephs.append(new t_ephCompass(*dynamic_cast<t_ephCompass*>(eph)));
    525       }
    526     }
    527   }
    528 }
     524        ephs.append(new t_ephBDS(*dynamic_cast<t_ephBDS*>(eph)));
     525      }
     526    }
     527  }
     528}
  • trunk/BNC/src/rinex/rnxnavfile.cpp

    r6518 r6600  
    198198        lines << stream->readLine();
    199199      }
    200       eph = new t_ephCompass(version(), lines);
     200      eph = new t_ephBDS(version(), lines);
    201201    }
    202202    if (eph && eph->checkState() != t_eph::bad) {
  • trunk/BNC/src/upload/bncephuploadcaster.cpp

    r6443 r6600  
    6666      const t_eph* eph = ephLast(it.next());
    6767
    68       const t_ephGPS*     ephGPS     = dynamic_cast<const t_ephGPS*>(eph);
    69       const t_ephGlo*     ephGlo     = dynamic_cast<const t_ephGlo*>(eph);
    70       const t_ephGal*     ephGal     = dynamic_cast<const t_ephGal*>(eph);
    71       const t_ephSBAS*    ephSBAS    = dynamic_cast<const t_ephSBAS*>(eph);
    72       const t_ephCompass* ephCompass = dynamic_cast<const t_ephCompass*>(eph);
     68      const t_ephGPS*  ephGPS  = dynamic_cast<const t_ephGPS*>(eph);
     69      const t_ephGlo*  ephGlo  = dynamic_cast<const t_ephGlo*>(eph);
     70      const t_ephGal*  ephGal  = dynamic_cast<const t_ephGal*>(eph);
     71      const t_ephSBAS* ephSBAS = dynamic_cast<const t_ephSBAS*>(eph);
     72      const t_ephBDS*  ephBDS  = dynamic_cast<const t_ephBDS*>(eph);
    7373
    7474      unsigned char Array[80];
     
    8787        size = t_ephEncoder::RTCM3(*ephSBAS, Array);
    8888      }
    89       else if (ephCompass) {
    90         size = t_ephEncoder::RTCM3(*ephCompass, Array);
     89      else if (ephBDS) {
     90        size = t_ephEncoder::RTCM3(*ephBDS, Array);
    9191      }
    9292      if (size > 0) {
Note: See TracChangeset for help on using the changeset viewer.