altosui: eliminate menu bar, moving elements to buttons.

[fw/altos] / ao-tools / altosui / AltosPad.java

diff --git a/ao-tools/altosui/AltosPad.java b/ao-tools/altosui/AltosPad.java
index 133dbed3e363b5383e10dc35607fd85a30cf384f..650ed01238fc0a7caac9a8f0893f942a67d1514b 100644 (file)
--- a/ao-tools/altosui/AltosPad.java
+++ b/ao-tools/altosui/AltosPad.java
@@ -35,22 +35,24 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        public class LaunchStatus {
                JLabel          label;
-               JLabel          value;
+               JTextField      value;
                AltosLights     lights;
 
                void show(AltosState state, int crc_errors) {}
                void reset() {
-                       value.setText("0");
+                       value.setText("");
                        lights.set(false);
                }
 
                public LaunchStatus (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
+                       c.weighty = 1;
 
                        lights = new AltosLights();
                        c.gridx = 0; c.gridy = y;
                        c.anchor = GridBagConstraints.CENTER;
-                       c.fill = GridBagConstraints.CENTER;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
                        layout.setConstraints(lights, c);
                        add(lights);
 
@@ -60,16 +62,18 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        c.gridx = 1; c.gridy = y;
                        c.insets = new Insets(10, 10, 10, 10);
                        c.anchor = GridBagConstraints.WEST;
-                       c.fill = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
                        layout.setConstraints(label, c);
                        add(label);
 
-                       value = new JLabel("4.00");
-                       value.setFont(label_font);
+                       value = new JTextField(15);
+                       value.setFont(value_font);
                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        c.gridx = 2; c.gridy = y;
-                       c.anchor = GridBagConstraints.EAST;
-                       c.fill = GridBagConstraints.EAST;
+                       c.anchor = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.BOTH;
+                       c.weightx = 1;
                        layout.setConstraints(value, c);
                        add(value);
 
@@ -78,31 +82,34 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        public class LaunchValue {
                JLabel          label;
-               JLabel          value;
+               JTextField      value;
                void show(AltosState state, int crc_errors) {}
 
                void reset() {
-                       value.setText("0");
+                       value.setText("");
                }
                public LaunchValue (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
+                       c.insets = new Insets(10, 10, 10, 10);
+                       c.weighty = 1;
 
                        label = new JLabel(text);
                        label.setFont(label_font);
                        label.setHorizontalAlignment(SwingConstants.LEFT);
                        c.gridx = 1; c.gridy = y;
-                       c.insets = new Insets(10, 10, 10, 10);
                        c.anchor = GridBagConstraints.WEST;
-                       c.fill = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
                        layout.setConstraints(label, c);
                        add(label);
 
-                       value = new JLabel("4.00");
-                       value.setFont(label_font);
+                       value = new JTextField(30);
+                       value.setFont(value_font);
                        value.setHorizontalAlignment(SwingConstants.RIGHT);
                        c.gridx = 2; c.gridy = y;
                        c.anchor = GridBagConstraints.EAST;
-                       c.fill = GridBagConstraints.EAST;
+                       c.fill = GridBagConstraints.BOTH;
+                       c.weightx = 1;
                        layout.setConstraints(value, c);
                        add(value);
                }
@@ -223,13 +230,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
        public AltosPad() {
                layout = new GridBagLayout();
 
-               GridBagConstraints      c;
-
                label_font = new Font("Dialog", Font.PLAIN, 24);
                value_font = new Font("Monospaced", Font.PLAIN, 24);
                setLayout(layout);
 
-               c = new GridBagConstraints();
                /* Elements in pad display:
                 *
                 * Battery voltage