import java.util.ArrayList;
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;
import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.AxisLocation;
-import org.jfree.ui.ApplicationFrame;
import org.jfree.ui.RefineryUtilities;
public class AltosGraphUI extends AltosFrame
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);
- static final private Color black = new Color(31,31,31);
+ //static final private Color black = new Color(31,31,31);
static final private Color yellow = new Color(194,194,31);
- static final private Color cyan = new Color(31,194,194);
+ //static final private Color cyan = new Color(31,194,194);
static final private Color magenta = new Color(194,31,194);
static private class OverallGraphs {
AltosGraphTime.Element height =
- new AltosGraphTime.TimeSeries(String.format("Height (%s)", AltosConvert.height.show_units()), "Height (AGL)", red) {
+ new AltosGraphTime.TimeSeries("Height", AltosConvert.height.show_units(), "Height (AGL)", red) {
public void gotTimeData(double time, AltosDataPoint d) {
double height = d.height();
if (height != AltosRecord.MISSING)
};
AltosGraphTime.Element speed =
- new AltosGraphTime.TimeSeries(String.format("Speed (%s)", AltosConvert.speed.show_units()), "Vertical Speed", green) {
+ new AltosGraphTime.TimeSeries("Speed", 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()) {
- speed = d.accel_speed();
- } else {
- speed = d.baro_speed();
- }
+ double speed = d.speed();
if (speed != AltosRecord.MISSING)
series.add(time, AltosConvert.speed.value(speed));
}
};
AltosGraphTime.Element acceleration =
- new AltosGraphTime.TimeSeries(String.format("Acceleration (%s)",
- AltosConvert.accel.show_units()),
+ new AltosGraphTime.TimeSeries("Acceleration",
+ AltosConvert.accel.show_units(),
"Axial Acceleration", blue)
{
public void gotTimeData(double time, AltosDataPoint d) {
};
AltosGraphTime.Element temperature =
- new AltosGraphTime.TimeSeries("Temperature (\u00B0C)",
- "Board temperature", red)
+ new AltosGraphTime.TimeSeries("Temperature", "\u00B0C",
+ "Board temperature", red)
{
public void gotTimeData(double time, AltosDataPoint d) {
double temp = d.temperature();
};
AltosGraphTime.Element drogue_voltage =
- new AltosGraphTime.TimeSeries("Voltage (V)", "Drogue Continuity", yellow)
+ new AltosGraphTime.TimeSeries("Voltage", "(V)", "Drogue Continuity", yellow)
{
public void gotTimeData(double time, AltosDataPoint d) {
double v = d.drogue_voltage();
};
AltosGraphTime.Element main_voltage =
- new AltosGraphTime.TimeSeries("Voltage (V)", "Main Continuity", magenta)
+ new AltosGraphTime.TimeSeries("Voltage", "(V)", "Main Continuity", magenta)
{
public void gotTimeData(double time, AltosDataPoint d) {
double v = d.main_voltage();
}
};
- AltosGraphTime.Element e_pad = new AltosGraphTime.StateMarker(Altos.ao_flight_pad, "Pad");
+ //AltosGraphTime.Element e_pad = new AltosGraphTime.StateMarker(Altos.ao_flight_pad, "Pad");
AltosGraphTime.Element e_boost = new AltosGraphTime.StateMarker(Altos.ao_flight_boost, "Boost");
AltosGraphTime.Element e_fast = new AltosGraphTime.StateMarker(Altos.ao_flight_fast, "Fast");
AltosGraphTime.Element e_coast = new AltosGraphTime.StateMarker(Altos.ao_flight_coast, "Coast");
return graphs;
}
}
-
+
+ /*
static private class AscentGraphs extends OverallGraphs {
protected AltosGraphTime myAltosGraphTime(String suffix) {
return (new AltosGraphTime("Ascent " + suffix) {
.addElement(e_coast);
}
}
-
+ */
+
+ /*
static private class DescentGraphs extends OverallGraphs {
protected AltosGraphTime myAltosGraphTime(String suffix) {
return (new AltosGraphTime("Descent " + suffix) {
// ((XYGraph)graph[8]).ymin = new Double(-50);
}
}
+ */
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, records, 0);
return createGraphsWhich(data, which).get(0);
}
+ /*
private static ArrayList<AltosGraph> createGraphs(
Iterable<AltosDataPoint> data)
{
return createGraphsWhich(data, -1);
}
+ */
private static ArrayList<AltosGraph> createGraphsWhich(
Iterable<AltosDataPoint> data, int which)