projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: resolve argument/variable ambiguity
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index 030bbc25d4dd25f54c114caaa98124979f14b8fc..527a7d280b138b4718b149c7b4b7800bf930e205 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;
@@
-122,9
+123,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)