X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosLanded.java;h=5c3111a280e67e0c8aec489204502d5dba5c2837;hp=71c1066318bad9c0410e994d7b76429ab41937c5;hb=1fc97dd9875a7639533a34438c4c7c999412eb3a;hpb=4e2fd7ae76c23aa8da1390ebcbd8f45276cd7a32 diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java index 71c10663..5c3111a2 100644 --- a/altosui/AltosLanded.java +++ b/altosui/AltosLanded.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package AltosUI; import java.awt.*; import java.awt.event.*; @@ -27,11 +27,10 @@ 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; - Font label_font; - Font value_font; public class LandedValue { JLabel label; @@ -47,6 +46,11 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio value.setVisible(true); } + public void set_font() { + label.setFont(Altos.label_font); + value.setFont(Altos.value_font); + } + void hide() { label.setVisible(false); value.setVisible(false); @@ -63,7 +67,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio 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); @@ -74,7 +78,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio 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; @@ -199,6 +203,16 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio 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); @@ -237,7 +251,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio FileInputStream in = new FileInputStream(file); records = new AltosTelemetryIterable(in); } else { - throw new FileNotFoundException(); + throw new FileNotFoundException(filename); } try { new AltosGraphUI(records, filename); @@ -246,7 +260,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio } } catch (FileNotFoundException fe) { JOptionPane.showMessageDialog(null, - filename, + fe.getMessage(), "Cannot open file", JOptionPane.ERROR_MESSAGE); } @@ -259,8 +273,6 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio 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 */