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 3f74fdd1a481224c0db121c8dab2cc9ad7a5190a..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_3.*;
+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;
@@ -388,7 +396,10 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
                        apogee.hide();
                speed.show(state, listener_state);
                accel.show(state, listener_state);
-               orient.show(state, listener_state);
+               if (state.orient() != AltosLib.MISSING)
+                       orient.show(state, listener_state);
+               else
+                       orient.hide();
        }
 
        public void labels(GridBagLayout layout, int y) {