telegps: Add graph display

Moved the altosui graph files to altosuilib and fixed things up.

Signed-off-by: Keith Packard <keithp@keithp.com>

6 files changed, 17 insertions, 777 deletions

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
deleted file mode 100644
index ba3875c6..00000000
--- a/altosui/AltosGraph.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.io.*;
-import java.util.ArrayList;
-
-import java.awt.*;
-import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
-
-import org.jfree.ui.*;
-import org.jfree.chart.*;
-import org.jfree.chart.plot.*;
-import org.jfree.chart.axis.*;
-import org.jfree.chart.renderer.*;
-import org.jfree.chart.renderer.xy.*;
-import org.jfree.chart.labels.*;
-import org.jfree.data.xy.*;
-import org.jfree.data.*;
-
-class AltosVoltage extends AltosUnits {
-
-	public double value(double v, boolean imperial_units) {
-		return v;
-	}
-
-	public double inverse(double v, boolean imperial_units) {
-		return v;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "V";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "volts";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return width / 2;
-	}
-}
-
-class AltosNsat extends AltosUnits {
-
-	public double value(double v, boolean imperial_units) {
-		return v;
-	}
-
-	public double inverse(double v, boolean imperial_units) {
-		return v;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "Sats";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "Satellites";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 0;
-	}
-}
-
-class AltosPressure extends AltosUnits {
-
-	public double value(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public double inverse(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "Pa";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "pascals";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 0;
-	}
-}
-
-class AltosDbm extends AltosUnits {
-
-	public double value(double d, boolean imperial_units) {
-		return d;
-	}
-
-	public double inverse(double d, boolean imperial_units) {
-		return d;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "dBm";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "D B M";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 0;
-	}
-}
-
-class AltosGyroUnits extends AltosUnits {
-
-	public double value(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public double inverse(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "°/sec";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "degrees per second";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 1;
-	}
-}
-
-class AltosMagUnits extends AltosUnits {
-
-	public double value(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public double inverse(double p, boolean imperial_units) {
-		return p;
-	}
-
-	public String show_units(boolean imperial_units) {
-		return "Ga";
-	}
-
-	public String say_units(boolean imperial_units) {
-		return "gauss";
-	}
-
-	public int show_fraction(int width, boolean imperial_units) {
-		return 2;
-	}
-}
-
-public class AltosGraph extends AltosUIGraph {
-
-	static final private Color height_color = new Color(194,31,31);
-	static final private Color gps_height_color = new Color(150,31,31);
-	static final private Color pressure_color = new Color (225,31,31);
-	static final private Color range_color = new Color(100, 31, 31);
-	static final private Color distance_color = new Color(100, 31, 194);
-	static final private Color speed_color = new Color(31,194,31);
-	static final private Color accel_color = new Color(31,31,194);
-	static final private Color voltage_color = new Color(194, 194, 31);
-	static final private Color battery_voltage_color = new Color(194, 194, 31);
-	static final private Color drogue_voltage_color = new Color(150, 150, 31);
-	static final private Color main_voltage_color = new Color(100, 100, 31);
-	static final private Color gps_nsat_color = new Color (194, 31, 194);
-	static final private Color gps_nsat_solution_color = new Color (194, 31, 194);
-	static final private Color gps_nsat_view_color = new Color (150, 31, 150);
-	static final private Color gps_course_color = new Color (100, 31, 112);
-	static final private Color gps_ground_speed_color = new Color (31, 112, 100);
-	static final private Color gps_climb_rate_color = new Color (31, 31, 112);
-	static final private Color temperature_color = new Color (31, 194, 194);
-	static final private Color dbm_color = new Color(31, 100, 100);
-	static final private Color state_color = new Color(0,0,0);
-	static final private Color accel_x_color = new Color(255, 0, 0);
-	static final private Color accel_y_color = new Color(0, 255, 0);
-	static final private Color accel_z_color = new Color(0, 0, 255);
-	static final private Color gyro_x_color = new Color(192, 0, 0);
-	static final private Color gyro_y_color = new Color(0, 192, 0);
-	static final private Color gyro_z_color = new Color(0, 0, 192);
-	static final private Color mag_x_color = new Color(128, 0, 0);
-	static final private Color mag_y_color = new Color(0, 128, 0);
-	static final private Color mag_z_color = new Color(0, 0, 128);
-	static final private Color orient_color = new Color(31, 31, 31);
-
-	static AltosVoltage voltage_units = new AltosVoltage();
-	static AltosPressure pressure_units = new AltosPressure();
-	static AltosNsat nsat_units = new AltosNsat();
-	static AltosDbm dbm_units = new AltosDbm();
-	static AltosGyroUnits gyro_units = new AltosGyroUnits();
-	static AltosOrient orient_units = new AltosOrient();
-	static AltosMagUnits mag_units = new AltosMagUnits();
-
-	AltosUIAxis	height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
-	AltosUIAxis	distance_axis, pressure_axis;
-	AltosUIAxis	gyro_axis, orient_axis, mag_axis;
-	AltosUIAxis	course_axis;
-
-	public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosGraphDataSet dataSet) {
-		super(enable);
-
-		height_axis = newAxis("Height", AltosConvert.height, height_color);
-		pressure_axis = newAxis("Pressure", pressure_units, pressure_color, 0);
-		speed_axis = newAxis("Speed", AltosConvert.speed, speed_color);
-		accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color);
-		voltage_axis = newAxis("Voltage", voltage_units, voltage_color);
-		temperature_axis = newAxis("Temperature", AltosConvert.temperature, temperature_color, 0);
-		nsat_axis = newAxis("Satellites", nsat_units, gps_nsat_color,
-				    AltosUIAxis.axis_include_zero | AltosUIAxis.axis_integer);
-		dbm_axis = newAxis("Signal Strength", dbm_units, dbm_color, 0);
-		distance_axis = newAxis("Distance", AltosConvert.distance, range_color);
-
-		gyro_axis = newAxis("Rotation Rate", gyro_units, gyro_z_color, 0);
-		orient_axis = newAxis("Tilt Angle", orient_units, orient_color, 0);
-		mag_axis = newAxis("Magnetic Field", mag_units, mag_x_color, 0);
-		course_axis = newAxis("Course", orient_units, gps_course_color, 0);
-
-		addMarker("State", AltosGraphDataPoint.data_state, state_color);
-		addSeries("Height",
-			  AltosGraphDataPoint.data_height,
-			  AltosConvert.height,
-			  height_color,
-			  true,
-			  height_axis);
-		addSeries("Pressure",
-			  AltosGraphDataPoint.data_pressure,
-			  pressure_units,
-			  pressure_color,
-			  false,
-			  pressure_axis);
-		addSeries("Speed",
-			  AltosGraphDataPoint.data_speed,
-			  AltosConvert.speed,
-			  speed_color,
-			  true,
-			  speed_axis);
-		addSeries("Acceleration",
-			  AltosGraphDataPoint.data_accel,
-			  AltosConvert.accel,
-			  accel_color,
-			  true,
-			  accel_axis);
-		if (stats.has_gps) {
-			addSeries("Range",
-				  AltosGraphDataPoint.data_range,
-				  AltosConvert.distance,
-				  range_color,
-				  false,
-				  distance_axis);
-			addSeries("Distance",
-				  AltosGraphDataPoint.data_distance,
-				  AltosConvert.distance,
-				  distance_color,
-				  false,
-				  distance_axis);
-			addSeries("GPS Height",
-				  AltosGraphDataPoint.data_gps_height,
-				  AltosConvert.height,
-				  gps_height_color,
-				  false,
-				  height_axis);
-			addSeries("GPS Satellites in Solution",
-				  AltosGraphDataPoint.data_gps_nsat_solution,
-				  nsat_units,
-				  gps_nsat_solution_color,
-				  false,
-				  nsat_axis);
-			addSeries("GPS Satellites in View",
-				  AltosGraphDataPoint.data_gps_nsat_view,
-				  nsat_units,
-				  gps_nsat_view_color,
-				  false,
-				  nsat_axis);
-			addSeries("GPS Course",
-				  AltosGraphDataPoint.data_gps_course,
-				  orient_units,
-				  gps_course_color,
-				  false,
-				  course_axis);
-			addSeries("GPS Ground Speed",
-				  AltosGraphDataPoint.data_gps_ground_speed,
-				  AltosConvert.speed,
-				  gps_ground_speed_color,
-				  false,
-				  speed_axis);
-			addSeries("GPS Climb Rate",
-				  AltosGraphDataPoint.data_gps_climb_rate,
-				  AltosConvert.speed,
-				  gps_climb_rate_color,
-				  false,
-				  speed_axis);
-		}
-		if (stats.has_rssi)
-			addSeries("Received Signal Strength",
-				  AltosGraphDataPoint.data_rssi,
-				  dbm_units,
-				  dbm_color,
-				  false,
-				  dbm_axis);
-		if (stats.has_other_adc) {
-			addSeries("Temperature",
-				  AltosGraphDataPoint.data_temperature,
-				  AltosConvert.temperature,
-				  temperature_color,
-				  false,
-				  temperature_axis);
-			addSeries("Battery Voltage",
-				  AltosGraphDataPoint.data_battery_voltage,
-				  voltage_units,
-				  battery_voltage_color,
-				  false,
-				  voltage_axis);
-			addSeries("Drogue Voltage",
-				  AltosGraphDataPoint.data_drogue_voltage,
-				  voltage_units,
-				  drogue_voltage_color,
-				  false,
-				  voltage_axis);
-			addSeries("Main Voltage",
-				  AltosGraphDataPoint.data_main_voltage,
-				  voltage_units,
-				  main_voltage_color,
-				  false,
-				  voltage_axis);
-		}
-
-		if (stats.has_imu) {
-			addSeries("Acceleration X",
-				  AltosGraphDataPoint.data_accel_x,
-				  AltosConvert.accel,
-				  accel_x_color,
-				  false,
-				  accel_axis);
-			addSeries("Acceleration Y",
-				  AltosGraphDataPoint.data_accel_y,
-				  AltosConvert.accel,
-				  accel_y_color,
-				  false,
-				  accel_axis);
-			addSeries("Acceleration Z",
-				  AltosGraphDataPoint.data_accel_z,
-				  AltosConvert.accel,
-				  accel_z_color,
-				  false,
-				  accel_axis);
-			addSeries("Rotation Rate X",
-				  AltosGraphDataPoint.data_gyro_x,
-				  gyro_units,
-				  gyro_x_color,
-				  false,
-				  gyro_axis);
-			addSeries("Rotation Rate Y",
-				  AltosGraphDataPoint.data_gyro_y,
-				  gyro_units,
-				  gyro_y_color,
-				  false,
-				  gyro_axis);
-			addSeries("Rotation Rate Z",
-				  AltosGraphDataPoint.data_gyro_z,
-				  gyro_units,
-				  gyro_z_color,
-				  false,
-				  gyro_axis);
-		}
-		if (stats.has_mag) {
-			addSeries("Magnetometer X",
-				  AltosGraphDataPoint.data_mag_x,
-				  mag_units,
-				  mag_x_color,
-				  false,
-				  mag_axis);
-			addSeries("Magnetometer Y",
-				  AltosGraphDataPoint.data_mag_y,
-				  mag_units,
-				  mag_y_color,
-				  false,
-				  mag_axis);
-			addSeries("Magnetometer Z",
-				  AltosGraphDataPoint.data_mag_z,
-				  mag_units,
-				  mag_z_color,
-				  false,
-				  mag_axis);
-		}
-		if (stats.has_orient)
-			addSeries("Tilt Angle",
-				  AltosGraphDataPoint.data_orient,
-				  orient_units,
-				  orient_color,
-				  false,
-				  orient_axis);
-		if (stats.num_ignitor > 0) {
-			for (int i = 0; i < stats.num_ignitor; i++)
-				addSeries(AltosIgnitor.ignitor_name(i),
-					  AltosGraphDataPoint.data_ignitor_0 + i,
-					  voltage_units,
-					  main_voltage_color,
-					  false,
-					  voltage_axis);
-			for (int i = 0; i < stats.num_ignitor; i++)
-				addMarker(AltosIgnitor.ignitor_name(i), AltosGraphDataPoint.data_ignitor_fired_0 + i, state_color);
-		}
-
-		setDataSet(dataSet);
-	}
-}
diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
deleted file mode 100644
index 06a9b62d..00000000
--- a/altosui/AltosGraphDataPoint.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import org.altusmetrum.altosuilib_2.*;
-import org.altusmetrum.altoslib_4.*;
-
-public class AltosGraphDataPoint implements AltosUIDataPoint {
-
-	AltosState	state;
-
-	public static final int data_height = 0;
-	public static final int data_speed = 1;
-	public static final int data_accel = 2;
-	public static final int data_temp = 3;
-	public static final int data_battery_voltage = 4;
-	public static final int data_drogue_voltage = 5;
-	public static final int data_main_voltage = 6;
-	public static final int data_rssi = 7;
-	public static final int data_state = 8;
-	public static final int data_gps_height = 9;
-	public static final int data_gps_nsat_solution = 10;
-	public static final int data_gps_nsat_view = 11;
-	public static final int data_temperature = 12;
-	public static final int data_range = 13;
-	public static final int data_distance = 14;
-	public static final int data_pressure = 15;
-	public static final int data_accel_x = 16;
-	public static final int data_accel_y = 17;
-	public static final int data_accel_z = 18;
-	public static final int data_gyro_x = 19;
-	public static final int data_gyro_y = 20;
-	public static final int data_gyro_z = 21;
-	public static final int data_mag_x = 22;
-	public static final int data_mag_y = 23;
-	public static final int data_mag_z = 24;
-	public static final int data_orient = 25;
-	public static final int data_gps_course = 26;
-	public static final int data_gps_ground_speed = 27;
-	public static final int data_gps_climb_rate = 28;
-	public static final int data_ignitor_0 = 29;
-	public static final int data_ignitor_num = 32;
-	public static final int data_ignitor_max = data_ignitor_0 + data_ignitor_num - 1;
-	public static final int data_ignitor_fired_0 = data_ignitor_0 + data_ignitor_num;
-	public static final int data_ignitor_fired_max = data_ignitor_fired_0 + data_ignitor_num - 1;
-
-	public double x() throws AltosUIDataMissing {
-		double	time = state.time_since_boost();
-		if (time < -2)
-			throw new AltosUIDataMissing(-1);
-		return time;
-	}
-
-	public double y(int index) throws AltosUIDataMissing {
-		double y = AltosLib.MISSING;
-		switch (index) {
-		case data_height:
-			y = state.height();
-			break;
-		case data_speed:
-			y = state.speed();
-			break;
-		case data_accel:
-			y = state.acceleration();
-			break;
-		case data_temp:
-			y = state.temperature;
-			break;
-		case data_battery_voltage:
-			y = state.battery_voltage;
-			break;
-		case data_drogue_voltage:
-			y = state.apogee_voltage;
-			break;
-		case data_main_voltage:
-			y = state.main_voltage;
-			break;
-		case data_rssi:
-			y = state.rssi;
-			break;
-		case data_gps_height:
-			y = state.gps_height;
-			break;
-		case data_gps_nsat_solution:
-			if (state.gps != null)
-				y = state.gps.nsat;
-			break;
-		case data_gps_nsat_view:
-			if (state.gps != null && state.gps.cc_gps_sat != null)
-				y = state.gps.cc_gps_sat.length;
-			break;
-		case data_temperature:
-			y = state.temperature;
-			break;
-		case data_range:
-			y = state.range;
-			break;
-		case data_distance:
-			if (state.from_pad != null)
-				y = state.from_pad.distance;
-			break;
-		case data_pressure:
-			y = state.pressure();
-			break;
-
-		case data_accel_x:
-		case data_accel_y:
-		case data_accel_z:
-		case data_gyro_x:
-		case data_gyro_y:
-		case data_gyro_z:
-			AltosIMU	imu = state.imu;
-			if (imu == null)
-				break;
-			switch (index) {
-			case data_accel_x:
-				y = imu.accel_x;
-				break;
-			case data_accel_y:
-				y = imu.accel_y;
-				break;
-			case data_accel_z:
-				y = imu.accel_z;
-				break;
-			case data_gyro_x:
-				y = imu.gyro_x;
-				break;
-			case data_gyro_y:
-				y = imu.gyro_y;
-				break;
-			case data_gyro_z:
-				y = imu.gyro_z;
-				break;
-			}
-			break;
-		case data_mag_x:
-		case data_mag_y:
-		case data_mag_z:
-			AltosMag	mag = state.mag;
-			if (mag == null)
-				break;
-			switch (index) {
-			case data_mag_x:
-				y = mag.x;
-				break;
-			case data_mag_y:
-				y = mag.y;
-				break;
-			case data_mag_z:
-				y = mag.z;
-				break;
-			}
-			break;
-		case data_orient:
-			y = state.orient();
-			break;
-		case data_gps_course:
-			if (state.gps != null)
-				y = state.gps.course;
-			else
-				y = AltosLib.MISSING;
-			break;
-		case data_gps_ground_speed:
-			if (state.gps != null)
-				y = state.gps.ground_speed;
-			else
-				y = AltosLib.MISSING;
-			break;
-		case data_gps_climb_rate:
-			if (state.gps != null)
-				y = state.gps.climb_rate;
-			else
-				y = AltosLib.MISSING;
-			break;
-		default:
-			if (data_ignitor_0 <= index && index <= data_ignitor_max) {
-				int ignitor = index - data_ignitor_0;
-				if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length)
-					y = state.ignitor_voltage[ignitor];
-			} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
-				int ignitor = index - data_ignitor_fired_0;
-				if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
-					if ((state.pyro_fired & (1 << ignitor)) != 0)
-						y = 1;
-					else
-						y = 0;
-				}
-			}
-			break;
-		}
-		if (y == AltosLib.MISSING)
-			throw new AltosUIDataMissing(index);
-		return y;
-	}
-
-	public int id(int index) {
-		if (index == data_state) {
-			int s = state.state;
-			if (Altos.ao_flight_boost <= s && s <= Altos.ao_flight_landed)
-				return s;
-		} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
-			int ignitor = index - data_ignitor_fired_0;
-			if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
-				if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
-					if ((state.pyro_fired & (1 << ignitor)) != 0)
-						return 1;
-				}
-			}
-		}
-		return -1;
-	}
-
-	public String id_name(int index) {
-		if (index == data_state) {
-			return state.state_name();
-		} else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
-			int ignitor = index - data_ignitor_fired_0;
-			if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length)
-				return AltosIgnitor.ignitor_name(ignitor);
-		}
-		return "";
-	}
-
-	public AltosGraphDataPoint (AltosState state) {
-		this.state = state;
-	}
-}
diff --git a/altosui/AltosGraphDataSet.java b/altosui/AltosGraphDataSet.java
deleted file mode 100644
index a90c2563..00000000
--- a/altosui/AltosGraphDataSet.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
-
-class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
-	AltosGraphDataSet	dataSet;
-	Iterator<AltosState>	iterator;
-
-	public boolean hasNext() {
-		return iterator.hasNext();
-	}
-
-	public AltosUIDataPoint next() {
-		AltosState	state = iterator.next();
-
-		if (state.flight != AltosLib.MISSING) {
-			if (dataSet.callsign == null && state.callsign != null)
-				dataSet.callsign = state.callsign;
-
-			if (dataSet.serial == 0 && state.serial != 0)
-				dataSet.serial = state.serial;
-
-			if (dataSet.flight == 0 && state.flight != 0)
-				dataSet.flight = state.flight;
-		}
-
-		return new AltosGraphDataPoint(state);
-	}
-
-	public AltosGraphIterator (Iterator<AltosState> iterator, AltosGraphDataSet dataSet) {
-		this.iterator = iterator;
-		this.dataSet = dataSet;
-	}
-
-	public void remove() {
-	}
-}
-
-class AltosGraphIterable implements Iterable<AltosUIDataPoint> {
-	AltosGraphDataSet	dataSet;
-
-	public Iterator<AltosUIDataPoint> iterator() {
-		return new AltosGraphIterator(dataSet.states.iterator(), dataSet);
-	}
-
-	public AltosGraphIterable(AltosGraphDataSet dataSet) {
-		this.dataSet = dataSet;
-	}
-}
-
-public class AltosGraphDataSet implements AltosUIDataSet {
-	String			callsign;
-	int			serial;
-	int			flight;
-	AltosStateIterable	states;
-
-	public String name() {
-		if (callsign != null)
-			return String.format("%s - %d/%d", callsign, serial, flight);
-		else
-			return String.format("%d/%d", serial, flight);
-	}
-
-	public Iterable<AltosUIDataPoint> dataPoints() {
-		return new AltosGraphIterable(this);
-	}
-
-	public AltosGraphDataSet (AltosStateIterable states) {
-		this.states = states;
-		this.callsign = null;
-		this.serial = 0;
-		this.flight = 0;
-	}
-}
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 33e12130..9e8a1939 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -1,6 +1,19 @@
-
-// Copyright (c) 2010 Anthony Towns
-// GPL v2 or later
+/*
+ * Copyright © 2010 Anthony Towns
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 or any later version of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
 
 package altosui;
 
diff --git a/altosui/AltosIgnitor.java b/altosui/AltosIgnitor.java
index 27917b30..7f62938d 100644
--- a/altosui/AltosIgnitor.java
+++ b/altosui/AltosIgnitor.java
@@ -114,10 +114,6 @@ public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
 		}
 	}
 
-	public static String ignitor_name(int i) {
-		return String.format("Ignitor %c", 'A' + i);
-	}
-
 	class Ignitor extends LaunchStatus {
 		int ignitor;
 
@@ -131,7 +127,7 @@ public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
 		}
 
 		public Ignitor (GridBagLayout layout, int y) {
-			super(layout, y, String.format ("%s Voltage", ignitor_name(y)));
+			super(layout, y, String.format ("%s Voltage", AltosLib.ignitor_name(y)));
 			ignitor = y;
 		}
 	}
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index add46825..1eb2d967 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -35,9 +35,6 @@ altosui_JAVA = \
 	AltosPad.java \
 	AltosUIPreferencesBackend.java \
 	AltosUI.java \
-	AltosGraph.java \
-	AltosGraphDataPoint.java \
-	AltosGraphDataSet.java \
 	AltosGraphUI.java
 
 JFREECHART_CLASS= \