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

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 16b0fd48..c30dc476 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -20,7 +20,7 @@ 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;
 
@@ -109,6 +109,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);
@@ -120,9 +122,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)
@@ -178,8 +178,8 @@ public class AltosGraphUI extends JFrame
         }
     }
 
-    public AltosGraphUI(AltosRecordIterable records) throws InterruptedException, IOException {
-		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)
@@ -238,8 +238,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()) {