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

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

1 files changed, 7 insertions, 10 deletions

diff --git a/ao-tools/altosui/AltosGraphUI.java b/ao-tools/altosui/AltosGraphUI.java
index 908aa3b4..cd158651 100644
--- a/ao-tools/altosui/AltosGraphUI.java
+++ b/ao-tools/altosui/AltosGraphUI.java
@@ -151,18 +151,15 @@ public class AltosGraphUI extends JFrame
         }
     }
 
-    public AltosGraphUI(JFrame frame)
-    {
-        super("Altos Graph");
+	public AltosGraphUI(AltosRecordIterable records) {
+		super("Altos Graph");
 
-        AltosGraphDataChooser chooser;
-        chooser = new AltosGraphDataChooser(frame);
-        Iterable<AltosDataPoint> reader = chooser.runDialog();
-        if (reader == null)
-            return;
+		Iterable<AltosDataPoint> reader = new AltosDataPointReader (records);
+		if (reader == null)
+			return;
         
-        init(reader, 0);
-    }
+		init(reader, 0);
+	}
 
     public AltosGraphUI(Iterable<AltosDataPoint> data, int which) 
     {