Changeset 6600 in ntrip

Timestamp:

Feb 20, 2015, 9:23:22 AM (9 years ago)

Author:

stuerze

Message:

complete renaming Compass to BDS

Location:

trunk/BNC/src

Files:

• RTCM3/ephEncoder.cpp (modified) (1 diff)
• RTCM3/ephEncoder.h (modified) (1 diff)
• ephemeris.cpp (modified) (3 diffs)
• ephemeris.h (modified) (1 diff)
• rinex/reqcedit.cpp (modified) (1 diff)
• rinex/rnxnavfile.cpp (modified) (1 diff)
• upload/bncephuploadcaster.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/ephEncoder.cpp

@@ -326 +326 @@
 }
 
-int t_ephEncoder::RTCM3(const t_ephCompass& /* eph */, unsigned char* /* buffer */) {
+int t_ephEncoder::RTCM3(const t_ephBDS& /* eph */, unsigned char* /* buffer */) {
 
   return 0;

trunk/BNC/src/RTCM3/ephEncoder.h

@@ -6 +6 @@
 class t_ephEncoder {
  public:
-  static int RTCM3(const t_ephGPS&     eph, unsigned char *);
-  static int RTCM3(const t_ephGlo&     eph, unsigned char *);
-  static int RTCM3(const t_ephGal&     eph, unsigned char *);
-  static int RTCM3(const t_ephSBAS&    eph, unsigned char *);
-  static int RTCM3(const t_ephCompass& eph, unsigned char *);
+  static int RTCM3(const t_ephGPS&  eph, unsigned char *);
+  static int RTCM3(const t_ephGlo&  eph, unsigned char *);
+  static int RTCM3(const t_ephGal&  eph, unsigned char *);
+  static int RTCM3(const t_ephSBAS& eph, unsigned char *);
+  static int RTCM3(const t_ephBDS&  eph, unsigned char *);
 };
 

trunk/BNC/src/ephemeris.cpp

@@ -1325 +1325 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_ephCompass::t_ephCompass(float rnxVersion, const QStringList& lines) {
+t_ephBDS::t_ephBDS(float rnxVersion, const QStringList& lines) {
 
   const int nLines = 8;
@@ -1475 +1475 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_irc t_ephCompass::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
+t_irc t_ephBDS::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
 
   if (_checkState == bad) {
@@ -1605 +1605 @@
 // RINEX Format String
 //////////////////////////////////////////////////////////////////////////////
-QString t_ephCompass::toString(double version) const {
+QString t_ephBDS::toString(double version) const {
 
   QString rnxStr = rinexDateStr(_TOC_bdt, _prn, version);

trunk/BNC/src/ephemeris.h

@@ -239 +239 @@
 };
 
-class t_ephCompass : public t_eph {
- friend class t_ephEncoder;
- public:
-  t_ephCompass() {}
-  t_ephCompass(float rnxVersion, const QStringList& lines);
-  virtual ~t_ephCompass() {}
-
-  // void set(const compassephemeris* ee);
+class t_ephBDS : public t_eph {
+ friend class t_ephEncoder;
+ public:
+ t_ephBDS() {}
+ t_ephBDS(float rnxVersion, const QStringList& lines);
+  virtual ~t_ephBDS() {}
+
+  void set(const bdsephemeris* ee);
   virtual e_type  type() const {return t_eph::Compass;}
   virtual int     IOD() const {return _AODC;}

trunk/BNC/src/rinex/reqcedit.cpp

@@ -522 +522 @@
       }
       else if (eph->type() == t_eph::Compass) {
-        ephs.append(new t_ephCompass(*dynamic_cast<t_ephCompass*>(eph)));
-      }
-    }
-  }
-}
+        ephs.append(new t_ephBDS(*dynamic_cast<t_ephBDS*>(eph)));
+      }
+    }
+  }
+}

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -198 +198 @@
         lines << stream->readLine();
       }
-      eph = new t_ephCompass(version(), lines);
+      eph = new t_ephBDS(version(), lines);
     }
     if (eph && eph->checkState() != t_eph::bad) {

trunk/BNC/src/upload/bncephuploadcaster.cpp

@@ -66 +66 @@
       const t_eph* eph = ephLast(it.next());
 
-      const t_ephGPS*     ephGPS     = dynamic_cast<const t_ephGPS*>(eph);
-      const t_ephGlo*     ephGlo     = dynamic_cast<const t_ephGlo*>(eph);
-      const t_ephGal*     ephGal     = dynamic_cast<const t_ephGal*>(eph);
-      const t_ephSBAS*    ephSBAS    = dynamic_cast<const t_ephSBAS*>(eph);
-      const t_ephCompass* ephCompass = dynamic_cast<const t_ephCompass*>(eph);
+      const t_ephGPS*  ephGPS  = dynamic_cast<const t_ephGPS*>(eph);
+      const t_ephGlo*  ephGlo  = dynamic_cast<const t_ephGlo*>(eph);
+      const t_ephGal*  ephGal  = dynamic_cast<const t_ephGal*>(eph);
+      const t_ephSBAS* ephSBAS = dynamic_cast<const t_ephSBAS*>(eph);
+      const t_ephBDS*  ephBDS  = dynamic_cast<const t_ephBDS*>(eph);
 
       unsigned char Array[80];
@@ -87 +87 @@
         size = t_ephEncoder::RTCM3(*ephSBAS, Array);
       }
-      else if (ephCompass) {
-        size = t_ephEncoder::RTCM3(*ephCompass, Array);
+      else if (ephBDS) {
+        size = t_ephEncoder::RTCM3(*ephBDS, Array);
       }
       if (size > 0) {