Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14606/src/common
Modified Files:
simmath.cpp
Log Message:
Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** simmath.cpp 7 Mar 2005 01:54:19 -0000 1.22
--- simmath.cpp 10 Mar 2005 03:28:28 -0000 1.23
***************
*** 595,599 ****
* @returns range in km
*/
! float tcKinematics::RangeToKm(tcKinematics& k) {
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
(float)k.mfLat_rad,(float)k.mfLon_rad);
--- 595,600 ----
* @returns range in km
*/
! float tcKinematics::RangeToKm(tcKinematics& k) const
! {
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
(float)k.mfLat_rad,(float)k.mfLon_rad);
***************
*** 602,606 ****
* @return range in km including range due to altitude difference
*/
! float tcKinematics::RangeToKmAlt(tcKinematics& k)
{
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
--- 603,607 ----
* @return range in km including range due to altitude difference
*/
! float tcKinematics::RangeToKmAlt(tcKinematics& k) const
{
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
***************
*** 609,613 ****
}
! float tcKinematics::RangeToKm(const GeoPoint *apGeoPoint)
{
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
--- 610,614 ----
}
! float tcKinematics::RangeToKm(const GeoPoint *apGeoPoint) const
{
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
***************
*** 619,623 ****
* @return approximate range in km, altitude difference is neglected
*/
! float tcKinematics::RangeToKm(const tcTrack& track)
{
float lat_rad = (float)track.mfLat_rad;
--- 620,624 ----
* @return approximate range in km, altitude difference is neglected
*/
! float tcKinematics::RangeToKm(const tcTrack& track) const
{
float lat_rad = (float)track.mfLat_rad;
***************
*** 630,634 ****
* @return approximate range in km, altitude difference is neglected
*/
! float tcKinematics::RangeToKm(float lon_rad, float lat_rad)
{
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
--- 631,635 ----
* @return approximate range in km, altitude difference is neglected
*/
! float tcKinematics::RangeToKm(float lon_rad, float lat_rad) const
{
return C_RADTOKM * nsNav::GCDistanceApprox_rad((float)mfLat_rad,(float)mfLon_rad,
|
