[rcpilot-cvs] src/rcpilot/rcgs Tracker.java,1.6,1.7

[<mjp...@us...>]

Update of /cvsroot/rcpilot/src/rcpilot/rcgs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26922

Modified Files:
	Tracker.java 
Log Message:
Moved bearing and distance calculation to TelemetryData


Index: Tracker.java
===================================================================
RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Tracker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Tracker.java	8 Mar 2004 22:12:02 -0000	1.6
--- Tracker.java	9 Mar 2004 20:31:02 -0000	1.7
***************
*** 119,124 ****
     	    
     		// Get the distance and bearing of the vehicle from the home point 
!    		int dist = (int)(((5 / viewsize) * (ringsize / 2)) * getDistance());
!    		double b = getBearing();
     		
     		// plot the vehicle's bearing
--- 119,124 ----
     	    
     		// Get the distance and bearing of the vehicle from the home point 
!    		int dist = (int)(((5 / viewsize) * (ringsize / 2)) * Rcgs.tdata.getDistanceToVehicle());
!    		double b = Rcgs.tdata.getBearingToVehicle();
     		
     		// plot the vehicle's bearing
***************
*** 162,187 ****
  	}
      
!     
!     
!     // **********
!     //
!     //  DISTANCE AND BEARING WILL BE IN TelemetryData AND CALCULATED EVERYTIME NEW DATA COMES IN
!     //
!     // ************
!     
!     private double getDistance(){    	        
! 		double d = GPS.geoDistance(GPS.secToDeg(Global.homeLat), GPS.secToDeg(Global.homeLon), GPS.secToDeg(Global.curLat), GPS.secToDeg(Global.curLon));
!     	return(d);
!     }
!     
!     private double getBearing(){
!     	
!     	double lat1 = GPS.secToDeg(Global.homeLat);
!     	double lon1 = GPS.secToDeg(Global.homeLon);
!     	double lat2 = GPS.secToDeg(Global.curLat);
!     	double lon2 = GPS.secToDeg(Global.curLon);
!     	
! 		double d = GPS.geoBearing(lat1,lon1 , lat2, lon2);
!     	return(d);
!     }
  }
--- 162,165 ----
  	}
      
!  
  }