altoslib/altosuilib: Change versions to altoslib:4, altosuilib:2
[fw/altos] / altosui / AltosDescent.java
index 0fcd690b781180548e31c8d5f13cdcd209a414c0..5cb693fe99ed89e404ed3e5bb76530154adad1d2 100644 (file)
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 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_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -36,7 +30,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                JTextField      value;
                AltosLights     lights;
 
-               abstract void show(AltosState state, int crc_errors);
+               abstract void show(AltosState state, AltosListenerState listener_state);
 
                void show() {
                        label.setVisible(true);
@@ -44,6 +38,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        lights.setVisible(true);
                }
 
+               void show(String s) {
+                       show();
+                       value.setText(s);
+               }
+
+               void show(String format, double value) {
+                       show(String.format(format, value));
+               }
+
                void hide() {
                        label.setVisible(false);
                        value.setVisible(false);
@@ -106,7 +109,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value.setText("");
                }
 
-               abstract void show(AltosState state, int crc_errors);
+               abstract void show(AltosState state, AltosListenerState listener_state);
 
                void show() {
                        label.setVisible(true);
@@ -118,14 +121,19 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value.setVisible(false);
                }
 
-               void show(String format, double v) {
-                       value.setText(String.format(format, v));
-               }
-
                void show(String v) {
+                       show();
                        value.setText(v);
                }
 
+               void show(AltosUnits units, double v) {
+                       show(units.show(8, v));
+               }
+
+               void show(String format, double v) {
+                       show(String.format(format, v));
+               }
+
                void set_font() {
                        label.setFont(Altos.label_font);
                        value.setFont(Altos.value_font);
@@ -185,7 +193,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value2.setFont(Altos.value_font);
                }
 
-               abstract void show(AltosState state, int crc_errors);
+               abstract void show(AltosState state, AltosListenerState listener_state);
 
                void show(String v1, String v2) {
                        show();
@@ -237,8 +245,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        }
 
        class Height extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       show("%6.0f m", state.height);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.height, state.height());
                }
                public Height (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Height");
@@ -248,11 +256,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Height  height;
 
        class Speed extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       double speed = state.speed;
-                       if (!state.ascent)
-                               speed = state.baro_speed;
-                       show("%6.0f m/s", speed);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.speed, state.speed());
                }
                public Speed (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Speed");
@@ -273,8 +278,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        }
 
        class Lat extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       if (state.gps != null && state.gps.connected)
+               void show (AltosState state, AltosListenerState listener_state) {
+                       if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
                                show(pos(state.gps.lat,"N", "S"));
                        else
                                show("???");
@@ -287,8 +292,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Lat lat;
 
        class Lon extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       if (state.gps != null && state.gps.connected)
+               void show (AltosState state, AltosListenerState listener_state) {
+                       if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
                                show(pos(state.gps.lon,"W", "E"));
                        else
                                show("???");
@@ -300,11 +305,26 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        Lon lon;
 
+       class Distance extends DescentValue {
+               void show(AltosState state, AltosListenerState listener_state) {
+                       if (state.from_pad != null)
+                               show(AltosConvert.distance, state.from_pad.distance);
+                       else
+                               show("???");
+               }
+
+               public Distance (GridBagLayout layout, int x, int y) {
+                       super(layout, x, y, "Ground Distance");
+               }
+       }
+
+       Distance distance;
+
+
        class Apogee extends DescentStatus {
-               void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(String.format("%4.2f V", state.drogue_sense));
-                       lights.set(state.drogue_sense > 3.2);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show("%4.2f V", state.apogee_voltage);
+                       lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
                }
                public Apogee (GridBagLayout layout, int y) {
                        super(layout, y, "Apogee Igniter Voltage");
@@ -314,10 +334,9 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Apogee apogee;
 
        class Main extends DescentStatus {
-               void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(String.format("%4.2f V", state.main_sense));
-                       lights.set(state.main_sense > 3.2);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show("%4.2f V", state.main_voltage);
+                       lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
                }
                public Main (GridBagLayout layout, int y) {
                        super(layout, y, "Main Igniter Voltage");
@@ -327,7 +346,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Main main;
 
        class Bearing extends DescentDualValue {
-               void show (AltosState state, int crc_errors) {
+               void show (AltosState state, AltosListenerState listener_state) {
                        if (state.from_pad != null) {
                                show( String.format("%3.0f°", state.from_pad.bearing),
                                      state.from_pad.bearing_words(
@@ -344,8 +363,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Bearing bearing;
 
        class Range extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       show("%6.0f m", state.range);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.distance, state.range);
                }
                public Range (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Range");
@@ -355,7 +374,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Range range;
 
        class Elevation extends DescentValue {
-               void show (AltosState state, int crc_errors) {
+               void show (AltosState state, AltosListenerState listener_state) {
                        show("%3.0f°", state.elevation);
                }
                public Elevation (GridBagLayout layout, int x, int y) {
@@ -372,6 +391,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                speed.reset();
                bearing.reset();
                range.reset();
+               distance.reset();
                elevation.reset();
                main.reset();
                apogee.reset();
@@ -384,37 +404,44 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                speed.set_font();
                bearing.set_font();
                range.set_font();
+               distance.set_font();
                elevation.set_font();
                main.set_font();
                apogee.set_font();
        }
 
-       public void show(AltosState state, int crc_errors) {
-               height.show(state, crc_errors);
-               speed.show(state, crc_errors);
+       public void show(AltosState state, AltosListenerState listener_state) {
+               height.show(state, listener_state);
+               speed.show(state, listener_state);
                if (state.gps != null && state.gps.connected) {
-                       bearing.show(state, crc_errors);
-                       range.show(state, crc_errors);
-                       elevation.show(state, crc_errors);
-                       lat.show(state, crc_errors);
-                       lon.show(state, crc_errors);
+                       bearing.show(state, listener_state);
+                       range.show(state, listener_state);
+                       distance.show(state, listener_state);
+                       elevation.show(state, listener_state);
+                       lat.show(state, listener_state);
+                       lon.show(state, listener_state);
                } else {
                        bearing.hide();
                        range.hide();
+                       distance.hide();
                        elevation.hide();
                        lat.hide();
                        lon.hide();
                }
-               if (state.main_sense != AltosRecord.MISSING)
-                       main.show(state, crc_errors);
+               if (state.main_voltage != AltosLib.MISSING)
+                       main.show(state, listener_state);
                else
                        main.hide();
-               if (state.drogue_sense != AltosRecord.MISSING)
-                       apogee.show(state, crc_errors);
+               if (state.apogee_voltage != AltosLib.MISSING)
+                       apogee.show(state, listener_state);
                else
                        apogee.hide();
        }
 
+       public String getName() {
+               return "Descent";
+       }
+
        public AltosDescent() {
                layout = new GridBagLayout();
 
@@ -426,10 +453,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                elevation = new Elevation(layout, 0, 1);
                range = new Range(layout, 2, 1);
                bearing = new Bearing(layout, 0, 2);
-               lat = new Lat(layout, 0, 3);
-               lon = new Lon(layout, 2, 3);
+               distance = new Distance(layout, 0, 3);
+               lat = new Lat(layout, 0, 4);
+               lon = new Lon(layout, 2, 4);
 
-               apogee = new Apogee(layout, 4);
-               main = new Main(layout, 5);
+               apogee = new Apogee(layout, 5);
+               main = new Main(layout, 6);
        }
 }