projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: A bunch of missing .gitignore files (mostly)
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index 16b0fd48552d77d4dcbbc3ec5ec022f8772d6519..59e92499e6a64439a32ce78b99f91a63122ffc6d 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-109,6
+109,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
+122,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
+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)
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());
{
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()) {