X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosAscent.java;h=945af7e26104665951e0768093e218d8df7358fb;hb=f9e1c5949a24e27897587b0b0ca00e089f362215;hp=38b3b30fe8cec9ee6ccd79306b0696fd5add6cc9;hpb=3c2f601139d36761de6a8a2210545d082ef16133;p=fw%2Faltos

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 38b3b30f..945af7e2 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -18,15 +18,7 @@
 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 AltosAscent extends JComponent implements AltosFlightDisplay {
@@ -169,14 +161,14 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			max_value.setFont(Altos.value_font);
 		}
 
-		void show(String format, double v) {
+		void show(AltosUnits units, double v) {
 			if (v == AltosRecord.MISSING) {
 				value.setText("Missing");
 				max_value.setText("Missing");
 			} else {
-				value.setText(String.format(format, v));
+				value.setText(units.show(8, v));
 				if (v > max || max == AltosRecord.MISSING) {
-					max_value.setText(String.format(format, v));
+					max_value.setText(units.show(8, v));
 					max = v;
 				}
 			}
@@ -221,7 +213,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	class Height extends AscentValueHold {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.height);
+			show(AltosConvert.height, state.height);
 		}
 		public Height (GridBagLayout layout, int y) {
 			super (layout, y, "Height");
@@ -235,7 +227,7 @@ public class AltosAscent 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 y) {
 			super (layout, y, "Speed");
@@ -246,7 +238,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	class Accel extends AscentValueHold {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m/s²", state.acceleration);
+			show(AltosConvert.accel, state.acceleration);
 		}
 		public Accel (GridBagLayout layout, int y) {
 			super (layout, y, "Acceleration");