[Gcblue-commits] gcb_wx/src/common simmath.cpp, 1.33, 1.34 tcOptions.cpp, 1.20, 1.21

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

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8446/src/common

Modified Files:
	simmath.cpp tcOptions.cpp 
Log Message:


Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** simmath.cpp	5 Sep 2006 01:04:25 -0000	1.33
--- simmath.cpp	24 Oct 2006 01:34:02 -0000	1.34
***************
*** 678,681 ****
--- 678,691 ----
        (float)apGeoPoint->mfLat_rad,(float)apGeoPoint->mfLon_rad);
  }
+ 
+ /**
+ * @returns radian heading to (lat,lon) point
+ */
+ float tcKinematics::HeadingToGeoRad(float lon_rad, float lat_rad)
+ {
+    return nsNav::GCHeadingApprox_rad((float)mfLat_rad,(float)mfLon_rad,
+ 										lat_rad, lon_rad);
+ }
+ 
  /**
  * @returns range in km

Index: tcOptions.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcOptions.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcOptions.cpp	1 Oct 2006 21:07:40 -0000	1.20
--- tcOptions.cpp	24 Oct 2006 01:34:02 -0000	1.21
***************
*** 94,103 ****
  
      oi.meType = tsOptionInfo::OT_RADIOBUTTON;
!     oi.mnStateCount = 3;
      oi.mnValue = 0;
      oi.mpAssociated = &symbologyType;
      oi.mzCaption[0] = "Icon (2525B) symbols";
      oi.mzCaption[1] = "NTDS symbols";
- 	oi.mzCaption[2] = "NTDS symbols (image)";
      AddOption(oi);
  
--- 94,102 ----
  
      oi.meType = tsOptionInfo::OT_RADIOBUTTON;
!     oi.mnStateCount = 2;
      oi.mnValue = 0;
      oi.mpAssociated = &symbologyType;
      oi.mzCaption[0] = "Icon (2525B) symbols";
      oi.mzCaption[1] = "NTDS symbols";
      AddOption(oi);