projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Reference altosuilib.jar and altoslib.jar from original dirs
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index f59f70bab47781daf0783e747875e2ec45542152..d6891ffa04d33e7bb719b4cbd449700b582deddd 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-10,12
+10,13
@@
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import org.altusmetrum.AltosLib.*;
import java.awt.*;
import javax.swing.*;
import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.ui.RefineryUtilities;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.ui.RefineryUtilities;
-public class AltosGraphUI extends AltosFrame
+public class AltosGraphUI extends Altos
UI
Frame
{
JTabbedPane pane;
{
JTabbedPane pane;
@@
-29,7
+30,7
@@
public class AltosGraphUI extends AltosFrame
static private class OverallGraphs {
AltosGraphTime.Element height =
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)
public void gotTimeData(double time, AltosDataPoint d) {
double height = d.height();
if (height != AltosRecord.MISSING)
@@
-38,7
+39,7
@@
public class AltosGraphUI extends AltosFrame
};
AltosGraphTime.Element speed =
};
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 = d.speed();
if (speed != AltosRecord.MISSING)
public void gotTimeData(double time, AltosDataPoint d) {
double speed = d.speed();
if (speed != AltosRecord.MISSING)
@@
-47,8
+48,8
@@
public class AltosGraphUI extends AltosFrame
};
AltosGraphTime.Element acceleration =
};
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) {
"Axial Acceleration", blue)
{
public void gotTimeData(double time, AltosDataPoint d) {
@@
-59,8
+60,8
@@
public class AltosGraphUI extends AltosFrame
};
AltosGraphTime.Element temperature =
};
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();
{
public void gotTimeData(double time, AltosDataPoint d) {
double temp = d.temperature();
@@
-70,7
+71,7
@@
public class AltosGraphUI extends AltosFrame
};
AltosGraphTime.Element drogue_voltage =
};
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();
{
public void gotTimeData(double time, AltosDataPoint d) {
double v = d.drogue_voltage();
@@
-80,7
+81,7
@@
public class AltosGraphUI extends AltosFrame
};
AltosGraphTime.Element main_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();
{
public void gotTimeData(double time, AltosDataPoint d) {
double v = d.main_voltage();