hamradio/klog
1
0
Fork 0
mirror of https://github.com/ea4k/klog.git synced 2024-09-22 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: Locator was not always properly calculated

Browse Source
This commit is contained in:
jaime 2013-06-18 19:22:26 +00:00
parent d7b5919681
commit b696cb9809
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/locator.cpp
View File

@ -23,7 +23,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA*
*****************************************************************************/
//#include <klocale.h>
//#include <kdebug.h>
#include <kdebug.h>
//#include <ostream.h>
#include "locator.h"
@ -124,7 +124,7 @@ double Locator::getLat(const QString& tlocator){
}
double Locator::getLon(const QString& tlocator){
// qDebug() << "Locator::getLon: " << tlocator;
//qDebug() << "Locator::getLon: " << tlocator;
if (isValidLocator(tlocator)){
// qDebug() << "Locator::getLon-2: " << QString::number((((tlocator.at(0)).toAscii() - 65) * 20) + (((tlocator.at(2)).toAscii() - 48) * 2) + (((tlocator.at(4)).toAscii() - 65 + 0.5) / 12) - 180) << endl;
@ -138,16 +138,23 @@ int Locator::getBeam(const double lon1, const double lat1, const double lon2, co
{
//lon1 & lat1 origin
//lon2 & lat2 destination
double lon_a,lat_a,lon_b,lat_b, bearing;
lon_a=lon1*PI/180; // Convert degrees to radians
lat_a=lat1*PI/180;
lon_b=lon2*PI/180;
lat_b=lat2*PI/180;
// fabs(fmodf(getBearing(vectorA, vectorB) + 180 - angle, 360) - 180);
//bearing_Distance( double lon_a, double lat_a, /* Lon/Lat of point A */
// double lon_b, double lat_b, /* Lon/Lat of point B */
// double *bearing, double *distance )/* From A to B */
//{
// lat2 = asin(sin(lat1)*cos(dist) + cos(lat1)*sin(dist)*cos(brg))
// lon2 = lon1 + atan2(sin(brg)*sin(dist)*cos(lat1), cos(dist)-sin(lat1)*sin(lat2))
double
gc_arc, cos_gc_arc, /* Great circle arc A to B */
cos_bearing, sin_bearing, /* cos/sin of bearing A to B */
@ -177,13 +184,11 @@ int Locator::getBeam(const double lon1, const double lat1, const double lon2, co
/* Convert to degrees */
bearing = (180 * bearing) / PI;
return (int)bearing;
}
int Locator::getDistance(const double lon1, const double lat1, const double lon2, const double lat2, const bool inKm){
//http://en.wikipedia.org/wiki/Haversine_formula
// qDebug() << "Locator::getDistanceKilometres: MyPos("<< QString::number(lon1) << "/"