projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Imperial units for graphs too
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index 16b0fd48552d77d4dcbbc3ec5ec022f8772d6519..edde1307e17d60dc6bae8b1baa8ca3980987f4ae 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-12,6
+12,7
@@
import java.awt.event.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.table.*;
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.ChartPanel;
import org.jfree.chart.ChartUtilities;
@@
-20,7
+21,7
@@
import org.jfree.chart.axis.AxisLocation;
import org.jfree.ui.ApplicationFrame;
import org.jfree.ui.RefineryUtilities;
import org.jfree.ui.ApplicationFrame;
import org.jfree.ui.RefineryUtilities;
-public class AltosGraphUI extends
J
Frame
+public class AltosGraphUI extends
Altos
Frame
{
JTabbedPane pane;
{
JTabbedPane pane;
@@
-34,16
+35,16
@@
public class AltosGraphUI extends JFrame
static private class OverallGraphs {
AltosGraphTime.Element height =
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)
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 =
}
};
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()) {
public void gotTimeData(double time, AltosDataPoint d) {
double speed;
if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
@@
-52,18
+53,19
@@
public class AltosGraphUI extends JFrame
speed = d.baro_speed();
}
if (speed != AltosRecord.MISSING)
speed = d.baro_speed();
}
if (speed != AltosRecord.MISSING)
-
series.add(time, speed
);
+
series.add(time, AltosConvert.speed.value(speed)
);
}
};
AltosGraphTime.Element acceleration =
}
};
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)
{
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)
);
}
};
}
};
@@
-109,6
+111,8
@@
public class AltosGraphUI extends JFrame
protected AltosGraphTime myAltosGraphTime(String suffix) {
return (new AltosGraphTime("Overall " + suffix))
.addElement(e_boost)
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);
.addElement(e_drogue)
.addElement(e_main)
.addElement(e_landed);
@@
-120,9
+124,7
@@
public class AltosGraphUI extends JFrame
graphs.add( myAltosGraphTime("Summary")
.addElement(height)
.addElement(speed)
graphs.add( myAltosGraphTime("Summary")
.addElement(height)
.addElement(speed)
- .addElement(acceleration)
- .addElement(drogue_voltage)
- .addElement(main_voltage) );
+ .addElement(acceleration) );
graphs.add( myAltosGraphTime("Summary")
.addElement(height)
graphs.add( myAltosGraphTime("Summary")
.addElement(height)
@@
-178,8
+180,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)
AltosDataPointReader reader = new AltosDataPointReader (records);
if (reader == null)
@@
-238,8
+240,8
@@
public class AltosGraphUI extends JFrame
{
ArrayList<AltosGraph> graph = new ArrayList<AltosGraph>();
graph.addAll((new OverallGraphs()).graphs());
{
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()) {
if (which > 0) {
if (which >= graph.size()) {