Changeset 3045 in ntrip


Ignore:
Timestamp:
Feb 25, 2011, 3:12:22 PM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNS
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNS/bns.cpp

    r3041 r3045  
    340340  in >> hlp >> _year >> _month >> _day >> _hour >> _min >> _sec;
    341341
    342   GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
     342  BNS::GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
    343343
    344344  if (_echoStream) {
     
    625625   
    626626    if (ii == 1) {
    627       XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
     627      BNS::XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
    628628      dClk = (xx(4) + xx(5) - xB(4)) * 299792458.0;
    629629    }
    630630    else {
    631       XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw2);
     631      BNS::XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw2);
    632632    }
    633633  }
  • trunk/BNS/bnseph.cpp

    r2768 r3045  
    2727
    2828using namespace std;
     29using namespace BNS;
    2930
    3031// Constructor
  • trunk/BNS/bnseph.h

    r2768 r3045  
    2424  virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
    2525                        ColumnVector& vv) const = 0;
    26   virtual t_irc read(const QStringList& lines) = 0;
     26  virtual BNS::t_irc read(const QStringList& lines) = 0;
    2727  virtual int  IOD() const = 0;
    2828  virtual int  RTCM3(unsigned char *) = 0;
     
    4242  };
    4343  virtual ~t_ephGlo() {};
    44   virtual t_irc  read(const QStringList& lines);
     44  virtual BNS::t_irc  read(const QStringList& lines);
    4545  virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
    4646                        ColumnVector& vv) const;
     
    7676  t_ephGPS() {};
    7777  virtual ~t_ephGPS() {};
    78   virtual t_irc  read(const QStringList& lines);
     78  virtual BNS::t_irc  read(const QStringList& lines);
    7979  virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
    8080                        ColumnVector& vv) const;
  • trunk/BNS/bnsoutf.cpp

    r3042 r3045  
    2222
    2323using namespace std;
     24using namespace BNS;
    2425
    2526// Constructor
  • trunk/BNS/bnsoutf.h

    r3041 r3045  
    1414  virtual ~bnsoutf();
    1515
    16   virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn,
    17                       const ColumnVector& xx, bool append);
     16  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn,
     17                           const ColumnVector& xx, bool append);
    1818
    1919 protected:
  • trunk/BNS/bnsrinex.cpp

    r3041 r3045  
    2323
    2424using namespace std;
     25using namespace BNS;
    2526
    2627// Constructor
  • trunk/BNS/bnsrinex.h

    r3041 r3045  
    1313           const QString& intr, int sampl);
    1414  virtual ~bnsRinex();
    15   virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn,
    16                       const ColumnVector& xx);
     15  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn,
     16                           const ColumnVector& xx);
    1717
    1818 private:
  • trunk/BNS/bnssp3.cpp

    r3041 r3045  
    2323
    2424using namespace std;
     25using namespace BNS;
    2526
    2627// Constructor
  • trunk/BNS/bnssp3.h

    r3041 r3045  
    1313         const QString& intr, int sampl);
    1414  virtual ~bnsSP3();
    15   virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn,
    16                       const ColumnVector& xx, bool append);
     15  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn,
     16                           const ColumnVector& xx, bool append);
    1717
    1818 private:
  • trunk/BNS/bnsutils.cpp

    r3039 r3045  
    2525
    2626using namespace std;
     27
     28namespace BNS {
    2729
    2830//
     
    209211}
    210212
     213} // namespace BNS
  • trunk/BNS/bnsutils.h

    r2558 r3045  
    1111class gpsEph;
    1212
    13 enum t_irc {failure = -1, success}; // return code
    14 
    15 void expandEnvVar(QString& str);
    16 
    17 QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
    18 
    19 void GPSweekFromDateAndTime(const QDateTime& dateTime,
    20                             int& GPSWeek, double& GPSWeeks);
    21 
    22 void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
    23                        double sec, int& GPSWeek, double& GPSWeeks);
    24 
    25 void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
    26 
    27 void currentGPSWeeks(int& week, double& sec);
    28 
    29 void XYZ_to_RSW(const ColumnVector& rr, const ColumnVector& vv,
    30                 const ColumnVector& xyz, ColumnVector& rsw);
    31 
    32 ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
    33                          double* acc,
    34            ColumnVector (*der)(double x, const ColumnVector& y, double* acc));
    35 
    36 QByteArray waitForLine(QTcpSocket* socket);
    37 
     13namespace BNS {
     14  enum t_irc {failure = -1, success}; // return code
     15 
     16  void expandEnvVar(QString& str);
     17 
     18  QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
     19 
     20  void GPSweekFromDateAndTime(const QDateTime& dateTime,
     21                              int& GPSWeek, double& GPSWeeks);
     22 
     23  void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
     24                         double sec, int& GPSWeek, double& GPSWeeks);
     25 
     26  void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
     27 
     28  void currentGPSWeeks(int& week, double& sec);
     29 
     30  void XYZ_to_RSW(const ColumnVector& rr, const ColumnVector& vv,
     31                  const ColumnVector& xyz, ColumnVector& rsw);
     32 
     33  ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
     34                           double* acc,
     35           ColumnVector (*der)(double x, const ColumnVector& y, double* acc));
     36 
     37  QByteArray waitForLine(QTcpSocket* socket);
     38}
    3839#endif
Note: See TracChangeset for help on using the changeset viewer.