X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=16b0fd48552d77d4dcbbc3ec5ec022f8772d6519;hp=a27aa37f9b8fe6d9400a50eaae9069565706f17d;hb=6ac604d11de44cd824f09e4b467264a2b74be7bd;hpb=6795d353be91df96a571cebc237e6a54a065a380

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index a27aa37f..16b0fd48 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -7,8 +7,11 @@ package altosui;
 import java.io.*;
 import java.util.ArrayList;
 
-import javax.swing.JFrame;
-import java.awt.Color;
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.ChartUtilities;
@@ -19,6 +22,8 @@ import org.jfree.ui.RefineryUtilities;
 
 public class AltosGraphUI extends JFrame 
 {
+    JTabbedPane	pane;
+
     static final private Color red = new Color(194,31,31);
     static final private Color green = new Color(31,194,31);
     static final private Color blue = new Color(31,31,194);
@@ -173,7 +178,7 @@ public class AltosGraphUI extends JFrame
         }
     }
 
-	public AltosGraphUI(AltosRecordIterable records) {
+    public AltosGraphUI(AltosRecordIterable records) throws InterruptedException, IOException {
 		super("Altos Graph");
 
 		AltosDataPointReader reader = new AltosDataPointReader (records);
@@ -181,25 +186,32 @@ public class AltosGraphUI extends JFrame
 			return;
         
 		if (reader.has_accel)
-			init(reader, 0);
+		    init(reader, records, 0);
 		else
-			init(reader, 1);
+		    init(reader, records, 1);
 	}
 
-    public AltosGraphUI(AltosDataPointReader data, int which)
-    {
-        super("Altos Graph");
-        init(data, which);
-    }
+//    public AltosGraphUI(AltosDataPointReader data, int which)
+    //  {
+//        super("Altos Graph");
+//        init(data, which);
+//    }
+
+    private void init(AltosDataPointReader data, AltosRecordIterable records, int which) throws InterruptedException, IOException {
+	pane = new JTabbedPane();
 
-    private void init(AltosDataPointReader data, int which) {
         AltosGraph graph = createGraph(data, which);
 
         JFreeChart chart = graph.createChart();
         ChartPanel chartPanel = new ChartPanel(chart);
         chartPanel.setMouseWheelEnabled(true);
         chartPanel.setPreferredSize(new java.awt.Dimension(800, 500));
-        setContentPane(chartPanel);
+        pane.add(graph.title, chartPanel);
+
+	AltosFlightStatsTable stats = new AltosFlightStatsTable(new AltosFlightStats(records));
+	pane.add("Flight Statistics", stats);
+
+	setContentPane (pane);
 
         pack();