X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltos.java;h=e4f974f9bedd22dc43b6aaf74a99052cc3133aa6;hb=e268798dc260311f5f0167909481b41c9d27fc1c;hp=416d93284122db99e66f6ac0e696714b5ded2aec;hpb=bf06af154e232d4caa1585a1d6d5279a075292e4;p=fw%2Faltos

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 416d9328..e4f974f9 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -97,9 +97,45 @@ public class Altos {
 
 	static final int tab_elt_pad = 5;
 
-	static final Font label_font = new Font("Dialog", Font.PLAIN, 22);
-	static final Font value_font = new Font("Monospaced", Font.PLAIN, 22);
-	static final Font status_font = new Font("SansSerif", Font.BOLD, 24);
+	static Font label_font;
+	static Font value_font;
+	static Font status_font;
+	static Font table_label_font;
+	static Font table_value_font;
+
+	final static int font_size_small = 1;
+	final static int font_size_medium = 2;
+	final static int font_size_large = 3;
+
+	static void set_fonts(int size) {
+		int	brief_size;
+		int	table_size;
+		int	status_size;
+
+		switch (size) {
+		case font_size_small:
+			brief_size = 16;
+			status_size = 18;
+			table_size = 11;
+			break;
+		default:
+		case font_size_medium:
+			brief_size = 22;
+			status_size = 24;
+			table_size = 14;
+			break;
+		case font_size_large:
+			brief_size = 26;
+			status_size = 30;
+			table_size = 17;
+			break;
+		}
+		label_font = new Font("Dialog", Font.PLAIN, brief_size);
+		value_font = new Font("Monospaced", Font.PLAIN, brief_size);
+		status_font = new Font("SansSerif", Font.BOLD, status_size);
+		table_label_font = new Font("SansSerif", Font.PLAIN, table_size);
+		table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
+	}
 
 	static final int text_width = 20;
 
@@ -112,6 +148,7 @@ public class Altos {
 		string_to_state.put("fast", ao_flight_fast);
 		string_to_state.put("coast", ao_flight_coast);
 		string_to_state.put("drogue", ao_flight_drogue);
+		string_to_state.put("apogee", ao_flight_coast);
 		string_to_state.put("main", ao_flight_main);
 		string_to_state.put("landed", ao_flight_landed);
 		string_to_state.put("invalid", ao_flight_invalid);
@@ -365,7 +402,13 @@ public class Altos {
 				libaltos.altos_init();
 				loaded_library = true;
 			} catch (UnsatisfiedLinkError e) {
-				loaded_library = false;
+				try {
+					System.loadLibrary("altos64");
+					libaltos.altos_init();
+					loaded_library = true;
+				} catch (UnsatisfiedLinkError e2) {
+					loaded_library = false;
+				}
 			}
 			initialized = true;
 		}