X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=61709afe0e769aaae0333819b1b2c21d6f4c1413;hb=f9e1c5949a24e27897587b0b0ca00e089f362215;hp=2a9e7eef3bf728d834d62b87021da6fd9d71b653;hpb=8f80f5705d64469bcfb00ff11aee68364edb271b;p=fw%2Faltos

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 2a9e7eef..61709afe 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,15 +18,8 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -55,6 +48,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lights.set(false);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public DescentStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -113,6 +111,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setVisible(false);
 		}
 
+		void show(AltosUnits units, double v) {
+			value.setText(units.show(8, v));
+		}
+
 		void show(String format, double v) {
 			value.setText(String.format(format, v));
 		}
@@ -121,6 +123,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setText(v);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public DescentValue (GridBagLayout layout, int x, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -169,6 +176,12 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value2.setVisible(false);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value1.setFont(Altos.value_font);
+			value2.setFont(Altos.value_font);
+		}
+
 		abstract void show(AltosState state, int crc_errors);
 
 		void show(String v1, String v2) {
@@ -222,7 +235,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Height extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.height);
+			show(AltosConvert.height, state.height);
 		}
 		public Height (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Height");
@@ -236,7 +249,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			double speed = state.speed;
 			if (!state.ascent)
 				speed = state.baro_speed;
-			show("%6.0f m/s", speed);
+			show(AltosConvert.speed, speed);
 		}
 		public Speed (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Speed");
@@ -329,7 +342,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Range extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.range);
+			show(AltosConvert.distance, state.range);
 		}
 		public Range (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Range");
@@ -361,6 +374,18 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		apogee.reset();
 	}
 
+	public void set_font() {
+		lat.set_font();
+		lon.set_font();
+		height.set_font();
+		speed.set_font();
+		bearing.set_font();
+		range.set_font();
+		elevation.set_font();
+		main.set_font();
+		apogee.set_font();
+	}
+
 	public void show(AltosState state, int crc_errors) {
 		height.show(state, crc_errors);
 		speed.show(state, crc_errors);