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
/
AltosLanded.java
diff --git
a/altosui/AltosLanded.java
b/altosui/AltosLanded.java
index 71c1066318bad9c0410e994d7b76429ab41937c5..5e073f7dce7184ff31ce9a7255c569f75c32e35e 100644
(file)
--- a/
altosui/AltosLanded.java
+++ b/
altosui/AltosLanded.java
@@
-20,18
+20,11
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.AltosLib.*;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
GridBagLayout layout;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
GridBagLayout layout;
- Font label_font;
- Font value_font;
public class LandedValue {
JLabel label;
public class LandedValue {
JLabel label;
@@
-47,23
+40,35
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
value.setVisible(true);
}
value.setVisible(true);
}
- void hide() {
- label.setVisible(false);
- value.setVisible(false);
+ 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) {
}
void show(String format, double v) {
- show();
- value.setText(String.format(format, v));
+ show(String.format(format, v));
+ }
+
+ public void set_font() {
+ label.setFont(Altos.label_font);
+ value.setFont(Altos.value_font);
}
}
+ void hide() {
+ label.setVisible(false);
+ value.setVisible(false);
+ }
public LandedValue (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
label = new JLabel(text);
public LandedValue (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
label = new JLabel(text);
- label.setFont(label_font);
+ label.setFont(
Altos.
label_font);
label.setHorizontalAlignment(SwingConstants.LEFT);
c.gridx = 0; c.gridy = y;
c.insets = new Insets(10, 10, 10, 10);
label.setHorizontalAlignment(SwingConstants.LEFT);
c.gridx = 0; c.gridy = y;
c.insets = new Insets(10, 10, 10, 10);
@@
-74,7
+79,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
add(label);
value = new JTextField(Altos.text_width);
add(label);
value = new JTextField(Altos.text_width);
- value.setFont(value_font);
+ value.setFont(
Altos.
value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 1; c.gridy = y;
c.anchor = GridBagConstraints.WEST;
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 1; c.gridy = y;
c.anchor = GridBagConstraints.WEST;
@@
-98,11
+103,10
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Lat extends LandedValue {
void show (AltosState state, int crc_errors) {
class Lat extends LandedValue {
void show (AltosState state, int crc_errors) {
- show();
if (state.gps != null && state.gps.connected)
if (state.gps != null && state.gps.connected)
-
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");
@@
-115,9
+119,9
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
void show (AltosState state, int crc_errors) {
show();
if (state.gps != null && state.gps.connected)
void show (AltosState state, int crc_errors) {
show();
if (state.gps != null && state.gps.connected)
-
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");
@@
-132,7
+136,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
if (state.from_pad != null)
show("%3.0f°", state.from_pad.bearing);
else
if (state.from_pad != null)
show("%3.0f°", state.from_pad.bearing);
else
-
value.setText
("???");
+
show
("???");
}
public Bearing (GridBagLayout layout, int y) {
super (layout, y, "Bearing");
}
public Bearing (GridBagLayout layout, int y) {
super (layout, y, "Bearing");
@@
-145,9
+149,9
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
void show (AltosState state, int crc_errors) {
show();
if (state.from_pad != null)
void show (AltosState state, int crc_errors) {
show();
if (state.from_pad != null)
- show(
"%6.0f m"
, state.from_pad.distance);
+ show(
AltosConvert.distance
, state.from_pad.distance);
else
else
-
value.setText
("???");
+
show
("???");
}
public Distance (GridBagLayout layout, int y) {
super (layout, y, "Distance");
}
public Distance (GridBagLayout layout, int y) {
super (layout, y, "Distance");
@@
-158,7
+162,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Height extends LandedValue {
void show (AltosState state, int crc_errors) {
class Height extends LandedValue {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m"
, state.max_height);
+ show(
AltosConvert.height
, state.max_height);
}
public Height (GridBagLayout layout, int y) {
super (layout, y, "Maximum Height");
}
public Height (GridBagLayout layout, int y) {
super (layout, y, "Maximum Height");
@@
-169,7
+173,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Speed extends LandedValue {
void show (AltosState state, int crc_errors) {
class Speed extends LandedValue {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m/s", state.max_speed
);
+ show(
AltosConvert.speed, state.max_speed()
);
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Maximum Speed");
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Maximum Speed");
@@
-180,7
+184,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Accel extends LandedValue {
void show (AltosState state, int crc_errors) {
class Accel extends LandedValue {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m/s²"
, state.max_acceleration);
+ show(
AltosConvert.accel
, state.max_acceleration);
}
public Accel (GridBagLayout layout, int y) {
super (layout, y, "Maximum Acceleration");
}
public Accel (GridBagLayout layout, int y) {
super (layout, y, "Maximum Acceleration");
@@
-199,6
+203,16
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
accel.reset();
}
accel.reset();
}
+ public void set_font() {
+ lat.set_font();
+ lon.set_font();
+ bearing.set_font();
+ distance.set_font();
+ height.set_font();
+ speed.set_font();
+ accel.set_font();
+ }
+
public void show(AltosState state, int crc_errors) {
if (state.gps != null && state.gps.connected) {
bearing.show(state, crc_errors);
public void show(AltosState state, int crc_errors) {
if (state.gps != null && state.gps.connected) {
bearing.show(state, crc_errors);
@@
-236,8
+250,11
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
records = new AltosTelemetryIterable(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
records = new AltosTelemetryIterable(in);
+ } else if (filename.endsWith("mega")) {
+ FileInputStream in = new FileInputStream(file);
+ records = new AltosEepromMegaIterable(in);
} else {
} else {
- throw new FileNotFoundException();
+ throw new FileNotFoundException(
filename
);
}
try {
new AltosGraphUI(records, filename);
}
try {
new AltosGraphUI(records, filename);
@@
-246,7
+263,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
}
} catch (FileNotFoundException fe) {
JOptionPane.showMessageDialog(null,
}
} catch (FileNotFoundException fe) {
JOptionPane.showMessageDialog(null,
- f
ilename
,
+ f
e.getMessage()
,
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
}
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
}
@@
-259,8
+276,6
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
reader = in_reader;
reader = in_reader;
- label_font = new Font("Dialog", Font.PLAIN, 22);
- value_font = new Font("Monospaced", Font.PLAIN, 22);
setLayout(layout);
/* Elements in descent display */
setLayout(layout);
/* Elements in descent display */