From: Anthony Towns <aj@erisian.com.au>
Date: Sat, 20 Nov 2010 07:40:49 +0000 (+1000)
Subject: Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
X-Git-Tag: debian/0.7.1+117+ge7954c8~8^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=081fbd5715f9d3d81d98e149fb95d40447c07a79;hp=-c

Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java
---

081fbd5715f9d3d81d98e149fb95d40447c07a79
diff --combined ao-tools/altosui/AltosFlightUI.java
index 658d6f6f,56ab7ebc..21b41528
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -36,19 -36,15 +36,17 @@@ public class AltosFlightUI extends JFra
  	AltosFlightReader	reader;
  	AltosDisplayThread	thread;
  
- 	private Box vbox;
- 
  	JTabbedPane	pane;
  
  	AltosPad	pad;
  	AltosAscent	ascent;
  	AltosDescent	descent;
  	AltosLanded	landed;
 +    AltosSiteMap    sitemap;
  
  	private AltosFlightStatus flightStatus;
  	private JScrollPane flightInfoPane;
 +	private JScrollPane sitemapPane;
  	private AltosInfoTable flightInfo;
  
  	static final int tab_pad = 1;
@@@ -98,7 -94,6 +96,7 @@@
  		descent.reset();
  		landed.reset();
  		flightInfo.clear();
 +		sitemap.reset();
  	}
  
  	public void show(AltosState state, int crc_errors) {
@@@ -125,29 -120,53 +123,54 @@@
  		}
  		flightStatus.show(state, crc_errors);
  		flightInfo.show(state, crc_errors);
 +		sitemap.show(state, crc_errors);
  	}
  
  	public void set_exit_on_close() {
  		exit_on_close = true;
  	}
  
+ 	Container	bag;
+ 
  	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
  		AltosPreferences.init(this);
  
  		voice = in_voice;
  		reader = in_reader;
  
+ 		bag = getContentPane();
+ 		bag.setLayout(new GridBagLayout());
+ 
+ 		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));
  
- 		flightStatus = new AltosFlightStatus();
+ 		if (serial >= 0) {
+ 			// Channel menu
+ 			JComboBox channels = new AltosChannelMenu(AltosPreferences.channel(serial));
+ 			channels.addActionListener(new ActionListener() {
+ 					public void actionPerformed(ActionEvent e) {
+ 						int channel = Integer.parseInt(e.getActionCommand());
+ 						reader.set_channel(channel);
+ 						AltosPreferences.set_channel(serial, channel);
+ 					}
+ 				});
+ 			c.gridx = 0;
+ 			c.gridy = 0;
+ 			c.anchor = GridBagConstraints.WEST;
+ 			bag.add (channels, c);
+ 		}
  
- 		vbox = new Box (BoxLayout.Y_AXIS);
- 		vbox.add(flightStatus);
+ 		flightStatus = new AltosFlightStatus();
+ 		c.gridx = 0;
+ 		c.gridy = 1;
+ 		c.fill = GridBagConstraints.HORIZONTAL;
+ 		c.weightx = 1;
+ 		bag.add(flightStatus, c);
  
  		pane = new JTabbedPane();
  
@@@ -167,33 -186,12 +190,16 @@@
  		flightInfoPane = new JScrollPane(flightInfo.box());
  		pane.add("Table", flightInfoPane);
  
 +        sitemap = new AltosSiteMap();
 +		sitemapPane = new JScrollPane(sitemap);
 +        pane.add("Site Map", sitemapPane);
 +
- 		vbox.add(pane);
- 
- 		this.add(vbox);
- 
- 		if (serial >= 0) {
- 			JMenuBar menubar = new JMenuBar();
- 
- 			// Channel menu
- 			{
- 				JMenu menu = new AltosChannelMenu(AltosPreferences.channel(serial));
- 				menu.addActionListener(new ActionListener() {
- 						public void actionPerformed(ActionEvent e) {
- 							int channel = Integer.parseInt(e.getActionCommand());
- 							reader.set_channel(channel);
- 							AltosPreferences.set_channel(serial, channel);
- 						}
- 					});
- 				menu.setMnemonic(KeyEvent.VK_C);
- 				menubar.add(menu);
- 			}
- 
- 			this.setJMenuBar(menubar);
- 		}
+ 		c.gridx = 0;
+ 		c.gridy = 2;
+ 		c.fill = GridBagConstraints.BOTH;
+ 		c.weightx = 1;
+ 		c.weighty = 1;
+ 		bag.add(pane, c);
  
  		this.setSize(this.getPreferredSize());
  		this.validate();
diff --combined ao-tools/altosui/Makefile.am
index b6b2e572,a603ca8a..41afdf27
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -40,13 -40,14 +40,14 @@@ altosui_JAVA = 
  	AltosGreatCircle.java \
  	AltosHexfile.java \
  	Altos.java \
+ 	AltosIgnite.java \
+ 	AltosIgniteUI.java \
  	AltosInfoTable.java \
  	AltosKML.java \
  	AltosLanded.java \
  	AltosLed.java \
  	AltosLights.java \
  	AltosLine.java \
- 	AltosLogfileChooser.java \
  	AltosLog.java \
  	AltosPad.java \
  	AltosParse.java \
@@@ -61,8 -62,6 +62,8 @@@
  	AltosSerial.java \
  	AltosSerialInUseException.java \
  	AltosSerialMonitor.java \
 +	AltosSiteMap.java \
 +	AltosSiteMapTile.java \
  	AltosState.java \
  	AltosTelemetry.java \
  	AltosTelemetryIterable.java \
@@@ -73,7 -72,7 +74,7 @@@
  	AltosGraph.java \
  	AltosGraphTime.java \
  	AltosGraphUI.java \
- 	AltosGraphDataChooser.java \
+ 	AltosDataChooser.java \
  	AltosVoice.java
  
  JFREECHART_CLASS= \