projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index ddc54cbd18a82958b4cefc1bd809a43cc7b80c1e..c04a4357f6f898bb5a54882abf7a9366cbeee76c 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-20,16
+20,11
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
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.*;
import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
-public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends Altos
UI
Frame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
AltosFlightReader reader;
AltosDisplayThread thread;
AltosVoice voice;
AltosFlightReader reader;
AltosDisplayThread thread;
@@
-44,6
+39,7
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
AltosSiteMap sitemap;
boolean has_map;
boolean has_companion;
AltosSiteMap sitemap;
boolean has_map;
boolean has_companion;
+ boolean has_state;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-107,9
+103,21
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
JComponent tab = which_tab(state);
try {
pad.show(state, crc_errors);
JComponent tab = which_tab(state);
try {
pad.show(state, crc_errors);
+
+ if (state.state != Altos.ao_flight_startup) {
+ if (!has_state) {
+ pane.setTitleAt(0, "Launch Pad");
+ pane.add(ascent, 1);
+ pane.add(descent, 2);
+ pane.add(landed, 3);
+ has_state = true;
+ }
+ }
+
ascent.show(state, crc_errors);
descent.show(state, crc_errors);
landed.show(state, crc_errors);
ascent.show(state, crc_errors);
descent.show(state, crc_errors);
landed.show(state, crc_errors);
+
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
@@
-144,7
+152,8
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
}
}
} catch (Exception e) {
}
}
} catch (Exception e) {
- System.out.print("Show exception" + e);
+ System.out.print("Show exception " + e + "\n");
+ e.printStackTrace();
}
}
}
}
@@
-170,10
+179,6
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
GridBagConstraints c = new GridBagConstraints();
GridBagConstraints c = new GridBagConstraints();
- java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
- if (imgURL != null)
- setIconImage(new ImageIcon(imgURL).getImage());
-
setTitle(String.format("AltOS %s", reader.name));
/* Stick channel selector at top of table for telemetry monitoring */
setTitle(String.format("AltOS %s", reader.name));
/* Stick channel selector at top of table for telemetry monitoring */
@@
-268,22
+273,18
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
pane = new JTabbedPane();
pad = new AltosPad();
pane = new JTabbedPane();
pad = new AltosPad();
- pane.add("
Launch Pad
", pad);
+ pane.add("
Status
", pad);
ascent = new AltosAscent();
ascent = new AltosAscent();
- pane.add("Ascent", ascent);
-
descent = new AltosDescent();
descent = new AltosDescent();
- pane.add("Descent", descent);
-
landed = new AltosLanded(reader);
landed = new AltosLanded(reader);
- pane.add("Landed", landed);
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
companion = new AltosCompanionInfo();
has_companion = false;
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
companion = new AltosCompanionInfo();
has_companion = false;
+ has_state = false;
sitemap = new AltosSiteMap();
has_map = false;
sitemap = new AltosSiteMap();
has_map = false;