Changeset 5450 in ntrip for trunk/GnssCenter

Timestamp:

Sep 13, 2013, 11:32:51 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

• const.h (modified) (1 diff)
• monitor.cpp (modified) (1 diff)
• utils.cpp (modified) (3 diffs)
• utils.h (modified) (1 diff)

trunk/GnssCenter/monitor/const.h

@@ -4 +4 @@
 namespace GnssCenter {
 
-enum t_irc {failure = -1, success, fatal}; // return code
-
 class t_CST {
  public:
+  enum t_irc {failure = -1, success, fatal}; // return code
   static const double aell;
   static const double fInv;

trunk/GnssCenter/monitor/monitor.cpp

@@ -140 +140 @@
       double ell[3];
 
-      if (xyz2ell(xyz, ell) == success) {
+      if (t_utils::xyz2ell(xyz, ell) == t_CST::success) {
         double latDeg = ell[0] * 180.0 / M_PI;
         double lonDeg = ell[1] * 180.0 / M_PI;

trunk/GnssCenter/monitor/utils.cpp

@@ -9 +9 @@
 // Rectangular Coordinates -> Ellipsoidal Coordinates
 ////////////////////////////////////////////////////////////////////////////
-t_irc xyz2ell(const double* XYZ, double* Ell) {
+t_CST::t_irc t_utils::xyz2ell(const double* XYZ, double* Ell) {
 
   const double bell = t_CST::aell*(1.0-1.0/t_CST::fInv) ;
@@ -37 +37 @@
     Ell[0] = atan(zps/(1.0-e2*nn/(nn+Ell[2]))) ;
     if ( fabs(phiOld-Ell[0]) <= 1.0e-11 && fabs(hOld-Ell[2]) <= 1.0e-5 ) {
-      return success;
+      return t_CST::success;
     }
   }
 
-  return failure;
+  return t_CST::failure;
 }
 
 // Rectangular Coordinates -> North, East, Up Components
 ////////////////////////////////////////////////////////////////////////////
-void xyz2neu(const double* Ell, const double* xyz, double* neu) {
+void t_utils::xyz2neu(const double* Ell, const double* xyz, double* neu) {
 
   double sinPhi = sin(Ell[0]);
@@ -67 +67 @@
 // North, East, Up Components -> Rectangular Coordinates
 ////////////////////////////////////////////////////////////////////////////
-void neu2xyz(const double* Ell, const double* neu, double* xyz) {
+void t_utils::neu2xyz(const double* Ell, const double* neu, double* xyz) {
 
   double sinPhi = sin(Ell[0]);

trunk/GnssCenter/monitor/utils.h

@@ -6 +6 @@
 namespace GnssCenter {
 
-t_irc xyz2ell(const double* XYZ, double* Ell);
+class t_utils {
+ public:
+  static t_CST::t_irc xyz2ell(const double* XYZ, double* Ell);
 
-void xyz2neu(const double* Ell, const double* xyz, double* neu);
+  static void xyz2neu(const double* Ell, const double* xyz, double* neu);
 
-void neu2xyz(const double* Ell, const double* neu, double* xyz);
+  static void neu2xyz(const double* Ell, const double* neu, double* xyz);
+};
 
 } // namespace GnssCenter