gcblue-commits

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9387/include/common

Modified Files:
	math_constants.h nsNav.h 
Log Message:
namespace housekeeping

Index: nsNav.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/nsNav.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nsNav.h	8 Aug 2004 00:31:31 -0000	1.7
--- nsNav.h	1 Jun 2005 00:13:25 -0000	1.8
***************
*** 28,51 ****
  #include "math_constants.h"
  
! namespace nsNav {
!    typedef struct _geopointrad {
!       float mfLon_rad;
!       float mfLat_rad;
!    } tsGeoPointRad;
!    float GCDistance_rad(tsGeoPointRad a, tsGeoPointRad b);
!    float GCDistanceApprox_rad(tsGeoPointRad a, tsGeoPointRad b);
!    float GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad);
!    float GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad,
!                                   float afAltA_m, float afAltB_m);
!    float GCHeading_rad(tsGeoPointRad a, tsGeoPointRad b, float *apfDistance_rad = 0);
!    float GCHeadingApprox_rad(tsGeoPointRad a, tsGeoPointRad b);
!    float GCHeadingApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad);
!    void Offset(const tsGeoPointRad& a, tsGeoPointRad& b, float afHeading_rad, float afRange_rad);
!    void OffsetApprox(const tsGeoPointRad& a, tsGeoPointRad& b, float afHeading_rad, float afRange_rad);
!    void OffsetApprox(float afLatA_rad, float afLonA_rad, 
!       float& afLatB_rad, float& afLonB_rad, float afHeading_rad, float afRange_rad);
!    float GetLatAlongGCPath(tsGeoPointRad a, tsGeoPointRad b, float afLon_rad);
!    void Test(void);
! }
  
  
--- 28,57 ----
  #include "math_constants.h"
  
! class nsNav 
! {
! public:
! 	struct tsGeoPointRad 
! 	{
! 		float mfLon_rad;
! 		float mfLat_rad;
! 	};
! 	static float GCDistance_rad(tsGeoPointRad a, tsGeoPointRad b);
! 	static float GCDistanceApprox_rad(tsGeoPointRad a, tsGeoPointRad b);
! 	static float GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad);
! 	static float GCDistanceApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad,
! 		float afAltA_m, float afAltB_m);
! 
! 	static float GCHeading_rad(tsGeoPointRad a, tsGeoPointRad b, float *apfDistance_rad = 0);
! 	static float GCHeadingApprox_rad(tsGeoPointRad a, tsGeoPointRad b);
! 	static float GCHeadingApprox_rad(float afLatA_rad, float afLonA_rad, float afLatB_rad, float afLonB_rad);
! 
! 	static void Offset(const tsGeoPointRad& a, tsGeoPointRad& b, float afHeading_rad, float afRange_rad);
! 	static void OffsetApprox(const tsGeoPointRad& a, tsGeoPointRad& b, float afHeading_rad, float afRange_rad);
! 	static void OffsetApprox(float afLatA_rad, float afLonA_rad, 
! 
! 		float& afLatB_rad, float& afLonB_rad, float afHeading_rad, float afRange_rad);
! 	static float GetLatAlongGCPath(tsGeoPointRad a, tsGeoPointRad b, float afLon_rad);
! 	static void Test();
! };
  
  

Index: math_constants.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/math_constants.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** math_constants.h	7 Mar 2005 01:54:18 -0000	1.10
--- math_constants.h	1 Jun 2005 00:13:25 -0000	1.11
***************
*** 55,64 ****
  #define C_RADARHOR 3.92482f ///< radar horizon in km = constant*sqrt(h in meters)
  #define C_VISUALHOR 2.78f ///< visible horizon in km = constant*sqrt(h in meters)
! namespace UnitConversions
  {
!     double toRadians(double deg);
!     float toRadians(float deg);
!     double toDegrees(double rad);
!     float toDegrees(float rad);
! }
  #endif
--- 55,69 ----
  #define C_RADARHOR 3.92482f ///< radar horizon in km = constant*sqrt(h in meters)
  #define C_VISUALHOR 2.78f ///< visible horizon in km = constant*sqrt(h in meters)
! 
! 
! class UnitConversions
  {
! public:
!     static double toRadians(double deg);
!     static float toRadians(float deg);
!     static double toDegrees(double rad);
!     static float toDegrees(float rad);
! };
! 
! 
  #endif