projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: remove un-used imports
[fw/altos]
/
altosui
/
AltosAscent.java
diff --git
a/altosui/AltosAscent.java
b/altosui/AltosAscent.java
index c8e5f3af07ea61fee1e21f4b8297fd22227d91d2..945af7e26104665951e0768093e218d8df7358fb 100644
(file)
--- a/
altosui/AltosAscent.java
+++ b/
altosui/AltosAscent.java
@@
-18,15
+18,8
@@
package altosui;
import java.awt.*;
package altosui;
import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
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 {
GridBagLayout layout;
public class AltosAscent extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-168,14
+161,14
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
max_value.setFont(Altos.value_font);
}
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 {
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) {
if (v > max || max == AltosRecord.MISSING) {
- max_value.setText(
String.format(format
, v));
+ max_value.setText(
units.show(8
, v));
max = v;
}
}
max = v;
}
}
@@
-220,7
+213,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Height extends AscentValueHold {
void show (AltosState state, int crc_errors) {
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");
}
public Height (GridBagLayout layout, int y) {
super (layout, y, "Height");
@@
-234,7
+227,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
double speed = state.speed;
if (!state.ascent)
speed = state.baro_speed;
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");
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Speed");
@@
-245,7
+238,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Accel extends AscentValueHold {
void show (AltosState state, int crc_errors) {
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");
}
public Accel (GridBagLayout layout, int y) {
super (layout, y, "Acceleration");