projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'micropeak-1.1'
[fw/altos]
/
altosui
/
AltosAscent.java
diff --git
a/altosui/AltosAscent.java
b/altosui/AltosAscent.java
index c8e5f3af07ea61fee1e21f4b8297fd22227d91d2..a05c44041ba2a91a4b681c9ceb3b7ad3080265b7 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;
@@
-50,6
+43,20
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
}
void show(AltosState state, int crc_errors) {}
}
void show(AltosState state, int crc_errors) {}
+
+ void show(String s) {
+ show();
+ value.setText(s);
+ }
+
+ void show(AltosUnits units, double v) {
+ show(units.show(8, v));
+ }
+
+ void show(String format, double v) {
+ show(String.format(format, v));
+ }
+
void reset() {
value.setText("");
lights.set(false);
void reset() {
value.setText("");
lights.set(false);
@@
-111,6
+118,19
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
value.setVisible(true);
}
value.setVisible(true);
}
+ void show(String s) {
+ show();
+ value.setText(s);
+ }
+
+ void show(AltosUnits units, double v) {
+ show(units.show(8, v));
+ }
+
+ void show(String format, double v) {
+ show(String.format(format, v));
+ }
+
void hide() {
label.setVisible(false);
value.setVisible(false);
void hide() {
label.setVisible(false);
value.setVisible(false);
@@
-168,14
+188,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
+240,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");
@@
-231,10
+251,10
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Speed extends AscentValueHold {
void show (AltosState state, int crc_errors) {
class Speed extends AscentValueHold {
void show (AltosState state, int crc_errors) {
- double speed = state.speed;
+ double speed = state.
accel_
speed;
if (!state.ascent)
speed = state.baro_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
+265,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");
@@
-267,8
+287,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Apogee extends AscentStatus {
void show (AltosState state, int crc_errors) {
class Apogee extends AscentStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4.2f V", state.drogue_sense));
+ show("%4.2f V", state.drogue_sense);
lights.set(state.drogue_sense > 3.2);
}
public Apogee (GridBagLayout layout, int y) {
lights.set(state.drogue_sense > 3.2);
}
public Apogee (GridBagLayout layout, int y) {
@@
-280,8
+299,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Main extends AscentStatus {
void show (AltosState state, int crc_errors) {
class Main extends AscentStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4.2f V", state.main_sense));
+ show("%4.2f V", state.main_sense);
lights.set(state.main_sense > 3.2);
}
public Main (GridBagLayout layout, int y) {
lights.set(state.main_sense > 3.2);
}
public Main (GridBagLayout layout, int y) {
@@
-293,11
+311,10
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Lat extends AscentValue {
void show (AltosState state, int crc_errors) {
class Lat extends AscentValue {
void show (AltosState state, int crc_errors) {
- show();
if (state.gps != null)
if (state.gps != null)
-
value.setText
(pos(state.gps.lat,"N", "S"));
+
show
(pos(state.gps.lat,"N", "S"));
else
else
-
value.setText
("???");
+
show
("???");
}
public Lat (GridBagLayout layout, int y) {
super (layout, y, "Latitude");
}
public Lat (GridBagLayout layout, int y) {
super (layout, y, "Latitude");
@@
-308,11
+325,10
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Lon extends AscentValue {
void show (AltosState state, int crc_errors) {
class Lon extends AscentValue {
void show (AltosState state, int crc_errors) {
- show();
if (state.gps != null)
if (state.gps != null)
-
value.setText
(pos(state.gps.lon,"E", "W"));
+
show
(pos(state.gps.lon,"E", "W"));
else
else
-
value.setText
("???");
+
show
("???");
}
public Lon (GridBagLayout layout, int y) {
super (layout, y, "Longitude");
}
public Lon (GridBagLayout layout, int y) {
super (layout, y, "Longitude");