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

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index a27aa37f..edde1307 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -7,8 +7,12 @@ 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.altusmetrum.AltosLib.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.ChartUtilities;
@@ -17,8 +21,10 @@ import org.jfree.chart.axis.AxisLocation;
 import org.jfree.ui.ApplicationFrame;
 import org.jfree.ui.RefineryUtilities;
 
-public class AltosGraphUI extends JFrame 
+public class AltosGraphUI extends AltosFrame 
 {
+    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);
@@ -29,16 +35,16 @@ public class AltosGraphUI extends JFrame
 
     static private class OverallGraphs {
         AltosGraphTime.Element height = 
-            new AltosGraphTime.TimeSeries("Height (m)", "Height (AGL)", red) {
+		new AltosGraphTime.TimeSeries(String.format("Height (%s)", AltosConvert.height.show_units()), "Height (AGL)", red) {
                 public void gotTimeData(double time, AltosDataPoint d) {
 			double	height = d.height();
 			if (height != AltosRecord.MISSING)
-				series.add(time, d.height()); 
+				series.add(time, AltosConvert.height.value(height));
                 } 
             };
     
         AltosGraphTime.Element speed =
-            new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) { 
+		new AltosGraphTime.TimeSeries(String.format("Speed (%s)", AltosConvert.speed.show_units()), "Vertical Speed", green) { 
                 public void gotTimeData(double time, AltosDataPoint d) {
 		    double	speed;
 		    if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
@@ -47,18 +53,19 @@ public class AltosGraphUI extends JFrame
 			speed = d.baro_speed();
                     }
 		    if (speed != AltosRecord.MISSING)
-			series.add(time, speed);
+			    series.add(time, AltosConvert.speed.value(speed));
                 }
             };
     
         AltosGraphTime.Element acceleration =
-            new AltosGraphTime.TimeSeries("Acceleration (m/s\u00B2)", 
-                    "Axial Acceleration", blue) 
+		new AltosGraphTime.TimeSeries(String.format("Acceleration (%s)",
+							    AltosConvert.accel.show_units()),
+					      "Axial Acceleration", blue)
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
 		    double acceleration = d.acceleration();
 		    if (acceleration != AltosRecord.MISSING)
-			series.add(time, acceleration);
+			    series.add(time, AltosConvert.accel.value(acceleration));
                 }
             };
     
@@ -104,6 +111,8 @@ public class AltosGraphUI extends JFrame
         protected AltosGraphTime myAltosGraphTime(String suffix) {
             return (new AltosGraphTime("Overall " + suffix))
                 .addElement(e_boost)
+		.addElement(e_fast)
+		.addElement(e_coast)
                 .addElement(e_drogue)
                 .addElement(e_main)
                 .addElement(e_landed);
@@ -115,9 +124,7 @@ public class AltosGraphUI extends JFrame
 	    graphs.add( myAltosGraphTime("Summary")
 			.addElement(height)
 			.addElement(speed)
-			.addElement(acceleration)
-			.addElement(drogue_voltage)
-			.addElement(main_voltage) );
+			.addElement(acceleration) );
 
 	    graphs.add( myAltosGraphTime("Summary")
 			.addElement(height)
@@ -173,33 +180,40 @@ public class AltosGraphUI extends JFrame
         }
     }
 
-	public AltosGraphUI(AltosRecordIterable records) {
-		super("Altos Graph");
+	public AltosGraphUI(AltosRecordIterable records, String name) throws InterruptedException, IOException {
+		super(String.format("Altos Graph %s", name));
 
 		AltosDataPointReader reader = new AltosDataPointReader (records);
 		if (reader == null)
 			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();
 
@@ -226,8 +240,8 @@ public class AltosGraphUI extends JFrame
     {
         ArrayList<AltosGraph> graph = new ArrayList<AltosGraph>();
         graph.addAll((new OverallGraphs()).graphs());
-        graph.addAll((new AscentGraphs()).graphs());
-        graph.addAll((new DescentGraphs()).graphs());
+//        graph.addAll((new AscentGraphs()).graphs());
+//        graph.addAll((new DescentGraphs()).graphs());
 
         if (which > 0) {
             if (which >= graph.size()) {