elide references to height

diff --git a/teststand/TestStandState.java b/teststand/TestStandState.java
index e75ab21408f72881e860c66be6d858b003563a3f..ffff67e910ffd473bba67bf22ae1c1144d117caf 100644 (file)
--- a/teststand/TestStandState.java
+++ b/teststand/TestStandState.java
@@ -47,81 +47,6 @@ public class TestStandState extends AltosUIFlightTab {
                }
        }
 
-       class Height extends ValueHold {
-               public double value(AltosState state, int i) {
-                       if (i == 0)
-                               return state.height();
-                       else
-                               return state.max_height();
-               }
-
-               public Height(Container container, int y) {
-                       super(container, y, AltosConvert.height, "Height");
-               }
-       }
-
-       class Speed extends ValueHold {
-               public double value(AltosState state, int i) {
-                       if (i == 0)
-                               return state.gps_speed();
-                       else
-                               return state.max_gps_speed();
-               }
-
-               public Speed(Container container, int y) {
-                       super(container, y, AltosConvert.speed, "Speed");
-               }
-       }
-
-       class Distance extends Value {
-               public double value(AltosState state, int i) {
-                       if (state.from_pad != null)
-                               return state.from_pad.distance;
-                       else
-                               return AltosLib.MISSING;
-               }
-
-               public Distance(Container container, int y) {
-                       super(container, y, AltosConvert.distance, "Distance");
-               }
-       }
-
-       class Range extends Value {
-               public double value(AltosState state, int i) {
-                       return state.range;
-               }
-               public Range (Container container, int y) {
-                       super (container, y, AltosConvert.distance, "Range");
-               }
-       }
-
-       class Bearing extends AltosUIIndicator {
-               public void show (AltosState state, AltosListenerState listener_state) {
-                       if (state.from_pad != null && state.from_pad.bearing != AltosLib.MISSING) {
-                               show( String.format("%3.0f°", state.from_pad.bearing),
-                                     state.from_pad.bearing_words(
-                                             AltosGreatCircle.BEARING_LONG));
-                       } else {
-                               show("Missing", "Missing");
-                       }
-               }
-               public Bearing (Container container, int y) {
-                       super (container, y, "Bearing", 2, false, 1);
-               }
-       }
-
-       class Elevation extends AltosUIIndicator {
-               public void show (AltosState state, AltosListenerState listener_state) {
-                       if (state.elevation == AltosLib.MISSING)
-                               show("Missing");
-                       else
-                               show("%3.0f°", state.elevation);
-               }
-               public Elevation (Container container, int y) {
-                       super (container, y, "Elevation", 1, false, 2);
-               }
-       }
-
        class FirmwareVersion extends AltosUIIndicator {
                public void show(AltosState state, AltosListenerState listener_state) {
                        if (state.firmware_version == null)
@@ -218,12 +143,6 @@ public class TestStandState extends AltosUIFlightTab {
        public TestStandState() {
                int y = 0;
                labels(this, y++);
-               add(new Height(this, y++));
-               add(new Speed(this, y++));
-               add(new Distance(this, y++));
-               add(new Range(this, y++));
-               add(new Bearing(this, y++));
-               add(new Elevation(this, y++));
                add(new FirmwareVersion(this, y++));
                add(new FlightLogMax(this, y++));
                add(new BatteryVoltage(this, y++));

diff --git a/teststand/TestStandStatus.java b/teststand/TestStandStatus.java
index e79d50a63db6ab5f517b493602da1ac9070ebd48..141b4812365eeb8883e0ac433bb6515fe59820f1 100644 (file)
--- a/teststand/TestStandStatus.java
+++ b/teststand/TestStandStatus.java
@@ -241,11 +241,6 @@ public class TestStandStatus extends JComponent implements AltosFlightDisplay {
                        stop();
        }
 
-       public int height() {
-               Dimension d = layout.preferredLayoutSize(this);
-               return d.height;
-       }
-
        TestStandStatusUpdate   status_update;
        javax.swing.Timer       timer;