altoslib/altosuilib: Change versions to altoslib:4, altosuilib:2

[fw/altos] / altosui / AltosAscent.java

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index ba4fc614bfc70646ddbbcda8e3a7eebf05459964..f6ccbf0c0713426fc8f59fe4dbe9d76609182b33 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -48,7 +49,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                        show();
                        value.setText(s);
                }
-               
+
                void show(AltosUnits units, double v) {
                        show(units.show(8, v));
                }
@@ -122,7 +123,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                        show();
                        value.setText(s);
                }
-               
+
                void show(AltosUnits units, double v) {
                        show(units.show(8, v));
                }
@@ -200,6 +201,13 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                                }
                        }
                }
+
+               void hide() {
+                       label.setVisible(false);
+                       value.setVisible(false);
+                       max_value.setVisible(false);
+               }
+
                public AscentValueHold (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -271,6 +279,17 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        Accel   accel;
 
+       class Orient extends AscentValueHold {
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.orient, state.orient());
+               }
+               public Orient (GridBagLayout layout, int y) {
+                       super (layout, y, "Tilt Angle");
+               }
+       }
+
+       Orient  orient;
+
        String pos(double p, String pos, String neg) {
                String  h = pos;
                if (p < 0) {
@@ -342,6 +361,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                height.reset();
                speed.reset();
                accel.reset();
+               orient.reset();
        }
 
        public void set_font() {
@@ -354,6 +374,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                height.set_font();
                speed.set_font();
                accel.set_font();
+               orient.set_font();
        }
 
        public void show(AltosState state, AltosListenerState listener_state) {
@@ -375,6 +396,10 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                        apogee.hide();
                speed.show(state, listener_state);
                accel.show(state, listener_state);
+               if (state.orient() != AltosLib.MISSING)
+                       orient.show(state, listener_state);
+               else
+                       orient.hide();
        }
 
        public void labels(GridBagLayout layout, int y) {
@@ -410,13 +435,15 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                 * lon
                 * height
                 */
-               labels(layout, 0);
-               height = new Height(layout, 1);
-               speed = new Speed(layout, 2);
-               accel = new Accel(layout, 3);
-               lat = new Lat(layout, 4);
-               lon = new Lon(layout, 5);
-               apogee = new Apogee(layout, 6);
-               main = new Main(layout, 7);
+               int y = 0;
+               labels(layout, y++);
+               height = new Height(layout, y++);
+               speed = new Speed(layout, y++);
+               accel = new Accel(layout, y++);
+               orient = new Orient(layout, y++);
+               lat = new Lat(layout, y++);
+               lon = new Lon(layout, y++);
+               apogee = new Apogee(layout, y++);
+               main = new Main(layout, y++);
        }
 }