Changeset 3045 in ntrip for trunk

Timestamp:

Feb 25, 2011, 3:12:22 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNS

Files:

• bns.cpp (modified) (2 diffs)
• bnseph.cpp (modified) (1 diff)
• bnseph.h (modified) (3 diffs)
• bnsoutf.cpp (modified) (1 diff)
• bnsoutf.h (modified) (1 diff)
• bnsrinex.cpp (modified) (1 diff)
• bnsrinex.h (modified) (1 diff)
• bnssp3.cpp (modified) (1 diff)
• bnssp3.h (modified) (1 diff)
• bnsutils.cpp (modified) (2 diffs)
• bnsutils.h (modified) (1 diff)

trunk/BNS/bns.cpp

@@ -340 +340 @@
   in >> hlp >> _year >> _month >> _day >> _hour >> _min >> _sec;
 
-  GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
+  BNS::GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
 
   if (_echoStream) {
@@ -625 +625 @@
     
     if (ii == 1) {
-      XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
+      BNS::XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
       dClk = (xx(4) + xx(5) - xB(4)) * 299792458.0;
     }
     else {
-      XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw2);
+      BNS::XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw2);
     }
   }

trunk/BNS/bnseph.cpp

@@ -27 +27 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor

trunk/BNS/bnseph.h

@@ -24 +24 @@
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const = 0;
-  virtual t_irc read(const QStringList& lines) = 0;
+  virtual BNS::t_irc read(const QStringList& lines) = 0;
   virtual int  IOD() const = 0;
   virtual int  RTCM3(unsigned char *) = 0;
@@ -42 +42 @@
   };
   virtual ~t_ephGlo() {};
-  virtual t_irc  read(const QStringList& lines);
+  virtual BNS::t_irc  read(const QStringList& lines);
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const;
@@ -76 +76 @@
   t_ephGPS() {};
   virtual ~t_ephGPS() {};
-  virtual t_irc  read(const QStringList& lines);
+  virtual BNS::t_irc  read(const QStringList& lines);
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const;

trunk/BNS/bnsoutf.cpp

@@ -22 +22 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor

trunk/BNS/bnsoutf.h

@@ -14 +14 @@
   virtual ~bnsoutf();
 
-  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx, bool append);
+  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                           const ColumnVector& xx, bool append);
 
  protected:

trunk/BNS/bnsrinex.cpp

@@ -23 +23 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor

trunk/BNS/bnsrinex.h

@@ -13 +13 @@
            const QString& intr, int sampl);
   virtual ~bnsRinex();
-  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx);
+  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                           const ColumnVector& xx);
 
  private:

trunk/BNS/bnssp3.cpp

@@ -23 +23 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor

trunk/BNS/bnssp3.h

@@ -13 +13 @@
          const QString& intr, int sampl);
   virtual ~bnsSP3();
-  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx, bool append);
+  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                           const ColumnVector& xx, bool append);
 
  private:

trunk/BNS/bnsutils.cpp

@@ -25 +25 @@
 
 using namespace std;
+
+namespace BNS {
 
 // 
@@ -209 +211 @@
 }
 
+} // namespace BNS

trunk/BNS/bnsutils.h

@@ -11 +11 @@
 class gpsEph;
 
-enum t_irc {failure = -1, success}; // return code
-
-void expandEnvVar(QString& str);
-
-QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
-
-void GPSweekFromDateAndTime(const QDateTime& dateTime, 
-                            int& GPSWeek, double& GPSWeeks);
-
-void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
-                       double sec, int& GPSWeek, double& GPSWeeks);
-
-void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
-
-void currentGPSWeeks(int& week, double& sec);
-
-void XYZ_to_RSW(const ColumnVector& rr, const ColumnVector& vv,
-                const ColumnVector& xyz, ColumnVector& rsw);
-
-ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
-                         double* acc,
-           ColumnVector (*der)(double x, const ColumnVector& y, double* acc));
-
-QByteArray waitForLine(QTcpSocket* socket);
-
+namespace BNS {
+  enum t_irc {failure = -1, success}; // return code
+  
+  void expandEnvVar(QString& str);
+  
+  QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
+  
+  void GPSweekFromDateAndTime(const QDateTime& dateTime, 
+                              int& GPSWeek, double& GPSWeeks);
+  
+  void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
+                         double sec, int& GPSWeek, double& GPSWeeks);
+  
+  void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
+  
+  void currentGPSWeeks(int& week, double& sec);
+  
+  void XYZ_to_RSW(const ColumnVector& rr, const ColumnVector& vv,
+                  const ColumnVector& xyz, ColumnVector& rsw);
+  
+  ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
+                           double* acc,
+           ColumnVector (*der)(double x, const ColumnVector& y, double* acc));
+  
+  QByteArray waitForLine(QTcpSocket* socket);
+}
 #endif