X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=db7815f3a7ab5ac4fcd069bd6f35bff95785b305;hp=6cd9463afbc056f39e7cde3561134a943bd75933;hb=bfa6cd8934b993bd4a67cfc7a4eeecf9b11915ef;hpb=2b6768ed32d7be444c49caa40d30b520177bb22a

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 6cd9463a..db7815f3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -87,6 +87,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	private int mAgeNewColor;
 	private int mAgeOldColor;
 
+	public static final String	tab_pad_name = "pad";
+	public static final String	tab_flight_name = "flight";
+	public static final String	tab_recover_name = "recover";
+	public static final String	tab_map_name = "map";
+
 	// field to display the version at the bottom of the screen
 	private TextView mVersion;
 
@@ -399,9 +404,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				if (prev_locked != locked) {
 					String currentTab = mTabHost.getCurrentTabTag();
 					if (locked) {
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
+						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 					} else {
-						if (currentTab.equals("flight")) mTabHost.setCurrentTabByTag("pad");
+						if (currentTab.equals(tab_flight_name)) mTabHost.setCurrentTabByTag(tab_pad_name);
 					}
 				}
 			} else {
@@ -409,13 +414,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 					String currentTab = mTabHost.getCurrentTabTag();
 					switch (state.state) {
 					case AltosLib.ao_flight_boost:
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
+						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 						break;
 					case AltosLib.ao_flight_landed:
-						if (currentTab.equals("flight")) mTabHost.setCurrentTabByTag("recover");
+						if (currentTab.equals(tab_flight_name)) mTabHost.setCurrentTabByTag(tab_recover_name);
 						break;
 					case AltosLib.ao_flight_stateless:
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
+						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 						break;
 					}
 				}
@@ -461,8 +466,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		for (AltosDroidTab mTab : mTabs)
 			mTab.update_ui(telem_state, state, from_receiver, location, mTab == mTabsAdapter.currentItem());
 
-		if (state != null && mAltosVoice != null)
-			mAltosVoice.tell(state, from_receiver);
+		if (mAltosVoice != null)
+			mAltosVoice.tell(telem_state, state, from_receiver, location, (AltosDroidTab) mTabsAdapter.currentItem());
 
 		saved_state = state;
 	}
@@ -535,10 +540,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 		mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager);
 
-		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator(create_tab_view("Pad")), TabPad.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("flight").setIndicator(create_tab_view("Flight")), TabFlight.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("recover").setIndicator(create_tab_view("Recover")), TabRecover.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_pad_name).setIndicator(create_tab_view("Pad")), TabPad.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_flight_name).setIndicator(create_tab_view("Flight")), TabFlight.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_recover_name).setIndicator(create_tab_view("Recover")), TabRecover.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_map_name).setIndicator(create_tab_view("Map")), TabMap.class, null);
 
 		// Display the Version
 		mVersion = (TextView) findViewById(R.id.version);
@@ -990,4 +995,29 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 		return false;
 	}
+
+	static String direction(AltosGreatCircle from_receiver,
+			     Location receiver) {
+		if (!receiver.hasBearing())
+			return null;
+
+		float	bearing = receiver.getBearing();
+		float	heading = (float) from_receiver.bearing - bearing;
+
+		while (heading <= -180.0f)
+			heading += 360.0f;
+		while (heading > 180.0f)
+			heading -= 360.0f;
+
+		int iheading = (int) (heading + 0.5f);
+
+		if (-1 < iheading && iheading < 1)
+			return "ahead";
+		else if (iheading < -179 || 179 < iheading)
+			return "backwards";
+		else if (iheading < 0)
+			return String.format("left %d", -iheading);
+		else
+			return String.format("right %d", iheading);
+	}
 }