Changeset 5450 in ntrip for trunk/GnssCenter


Ignore:
Timestamp:
Sep 13, 2013, 11:32:51 AM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/GnssCenter/monitor
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GnssCenter/monitor/const.h

    r5447 r5450  
    44namespace GnssCenter {
    55
    6 enum t_irc {failure = -1, success, fatal}; // return code
    7 
    86class t_CST {
    97 public:
     8  enum t_irc {failure = -1, success, fatal}; // return code
    109  static const double aell;
    1110  static const double fInv;
  • trunk/GnssCenter/monitor/monitor.cpp

    r5449 r5450  
    140140      double ell[3];
    141141
    142       if (xyz2ell(xyz, ell) == success) {
     142      if (t_utils::xyz2ell(xyz, ell) == t_CST::success) {
    143143        double latDeg = ell[0] * 180.0 / M_PI;
    144144        double lonDeg = ell[1] * 180.0 / M_PI;
  • trunk/GnssCenter/monitor/utils.cpp

    r5447 r5450  
    99// Rectangular Coordinates -> Ellipsoidal Coordinates
    1010////////////////////////////////////////////////////////////////////////////
    11 t_irc xyz2ell(const double* XYZ, double* Ell) {
     11t_CST::t_irc t_utils::xyz2ell(const double* XYZ, double* Ell) {
    1212
    1313  const double bell = t_CST::aell*(1.0-1.0/t_CST::fInv) ;
     
    3737    Ell[0] = atan(zps/(1.0-e2*nn/(nn+Ell[2]))) ;
    3838    if ( fabs(phiOld-Ell[0]) <= 1.0e-11 && fabs(hOld-Ell[2]) <= 1.0e-5 ) {
    39       return success;
     39      return t_CST::success;
    4040    }
    4141  }
    4242
    43   return failure;
     43  return t_CST::failure;
    4444}
    4545
    4646// Rectangular Coordinates -> North, East, Up Components
    4747////////////////////////////////////////////////////////////////////////////
    48 void xyz2neu(const double* Ell, const double* xyz, double* neu) {
     48void t_utils::xyz2neu(const double* Ell, const double* xyz, double* neu) {
    4949
    5050  double sinPhi = sin(Ell[0]);
     
    6767// North, East, Up Components -> Rectangular Coordinates
    6868////////////////////////////////////////////////////////////////////////////
    69 void neu2xyz(const double* Ell, const double* neu, double* xyz) {
     69void t_utils::neu2xyz(const double* Ell, const double* neu, double* xyz) {
    7070
    7171  double sinPhi = sin(Ell[0]);
  • trunk/GnssCenter/monitor/utils.h

    r5447 r5450  
    66namespace GnssCenter {
    77
    8 t_irc xyz2ell(const double* XYZ, double* Ell);
     8class t_utils {
     9 public:
     10  static t_CST::t_irc xyz2ell(const double* XYZ, double* Ell);
    911
    10 void xyz2neu(const double* Ell, const double* xyz, double* neu);
     12  static void xyz2neu(const double* Ell, const double* xyz, double* neu);
    1113
    12 void neu2xyz(const double* Ell, const double* neu, double* xyz);
     14  static void neu2xyz(const double* Ell, const double* neu, double* xyz);
     15};
    1316
    1417} // namespace GnssCenter
Note: See TracChangeset for help on using the changeset viewer.