projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Have single radio_to_frequency function
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index cd158651402d2634e4763015c1d36214b7899fb4..a27aa37f9b8fe6d9400a50eaae9069565706f17d 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-23,23
+23,31
@@
public class AltosGraphUI extends JFrame
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 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 yellow = new Color(194,194,31);
+ 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("Height (m)", "Height (AGL)", red) {
public void gotTimeData(double time, AltosDataPoint d) {
static private class OverallGraphs {
AltosGraphTime.Element height =
new AltosGraphTime.TimeSeries("Height (m)", "Height (AGL)", red) {
public void gotTimeData(double time, AltosDataPoint d) {
- series.add(time, d.height());
+ double height = d.height();
+ if (height != AltosRecord.MISSING)
+ series.add(time, d.height());
}
};
AltosGraphTime.Element speed =
new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) {
public void gotTimeData(double time, AltosDataPoint d) {
}
};
AltosGraphTime.Element speed =
new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) {
public void gotTimeData(double time, AltosDataPoint d) {
- if (d.state() < Altos.ao_flight_drogue) {
- series.add(time, d.accel_speed());
+ double speed;
+ if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
+ speed = d.accel_speed();
} else {
} else {
-
series.add(time, d.baro_speed()
);
+
speed = d.baro_speed(
);
}
}
+ if (speed != AltosRecord.MISSING)
+ series.add(time, speed);
}
};
}
};
@@
-48,7
+56,9
@@
public class AltosGraphUI extends JFrame
"Axial Acceleration", blue)
{
public void gotTimeData(double time, AltosDataPoint d) {
"Axial Acceleration", blue)
{
public void gotTimeData(double time, AltosDataPoint d) {
- series.add(time, d.acceleration());
+ double acceleration = d.acceleration();
+ if (acceleration != AltosRecord.MISSING)
+ series.add(time, acceleration);
}
};
}
};
@@
-57,23
+67,29
@@
public class AltosGraphUI extends JFrame
"Board temperature", red)
{
public void gotTimeData(double time, AltosDataPoint d) {
"Board temperature", red)
{
public void gotTimeData(double time, AltosDataPoint d) {
- series.add(time, d.temperature());
+ double temp = d.temperature();
+ if (temp != AltosRecord.MISSING)
+ series.add(time, d.temperature());
}
};
AltosGraphTime.Element drogue_voltage =
}
};
AltosGraphTime.Element drogue_voltage =
- new AltosGraphTime.TimeSeries("Voltage (V)", "Drogue Continuity",
blue
)
+ new AltosGraphTime.TimeSeries("Voltage (V)", "Drogue Continuity",
yellow
)
{
public void gotTimeData(double time, AltosDataPoint d) {
{
public void gotTimeData(double time, AltosDataPoint d) {
- series.add(time, d.drogue_voltage());
+ double v = d.drogue_voltage();
+ if (v != AltosRecord.MISSING)
+ series.add(time, v);
}
};
AltosGraphTime.Element main_voltage =
}
};
AltosGraphTime.Element main_voltage =
- new AltosGraphTime.TimeSeries("Voltage (V)", "Main Continuity",
green
)
+ new AltosGraphTime.TimeSeries("Voltage (V)", "Main Continuity",
magenta
)
{
public void gotTimeData(double time, AltosDataPoint d) {
{
public void gotTimeData(double time, AltosDataPoint d) {
- series.add(time, d.main_voltage());
+ double v = d.main_voltage();
+ if (v != AltosRecord.MISSING)
+ series.add(time, v);
}
};
}
};
@@
-96,10
+112,16
@@
public class AltosGraphUI extends JFrame
public ArrayList<AltosGraph> graphs() {
ArrayList<AltosGraph> graphs = new ArrayList<AltosGraph>();
public ArrayList<AltosGraph> graphs() {
ArrayList<AltosGraph> graphs = new ArrayList<AltosGraph>();
- graphs.add( myAltosGraphTime("Summary")
- .addElement(height)
- .addElement(speed)
- .addElement(acceleration) );
+ graphs.add( myAltosGraphTime("Summary")
+ .addElement(height)
+ .addElement(speed)
+ .addElement(acceleration)
+ .addElement(drogue_voltage)
+ .addElement(main_voltage) );
+
+ graphs.add( myAltosGraphTime("Summary")
+ .addElement(height)
+ .addElement(speed));
graphs.add( myAltosGraphTime("Altitude")
.addElement(height) );
graphs.add( myAltosGraphTime("Altitude")
.addElement(height) );
@@
-107,15
+129,15
@@
public class AltosGraphUI extends JFrame
graphs.add( myAltosGraphTime("Speed")
.addElement(speed) );
graphs.add( myAltosGraphTime("Speed")
.addElement(speed) );
-
graphs.add( myAltosGraphTime("Acceleration")
- .addElement(acceleration) );
+ graphs.add( myAltosGraphTime("Acceleration")
+
.addElement(acceleration) );
graphs.add( myAltosGraphTime("Temperature")
.addElement(temperature) );
graphs.add( myAltosGraphTime("Temperature")
.addElement(temperature) );
-
graphs.add( myAltosGraphTime("Continuity")
- .addElement(drogue_voltage)
- .addElement(main_voltage) );
+ graphs.add( myAltosGraphTime("Continuity")
+
.addElement(drogue_voltage)
+
.addElement(main_voltage) );
return graphs;
}
return graphs;
}
@@
-154,20
+176,23
@@
public class AltosGraphUI extends JFrame
public AltosGraphUI(AltosRecordIterable records) {
super("Altos Graph");
public AltosGraphUI(AltosRecordIterable records) {
super("Altos Graph");
-
Iterable<AltosDataPoint>
reader = new AltosDataPointReader (records);
+
AltosDataPointReader
reader = new AltosDataPointReader (records);
if (reader == null)
return;
if (reader == null)
return;
- init(reader, 0);
+ if (reader.has_accel)
+ init(reader, 0);
+ else
+ init(reader, 1);
}
}
- public AltosGraphUI(
Iterable<AltosDataPoint> data, int which)
+ public AltosGraphUI(
AltosDataPointReader data, int which)
{
super("Altos Graph");
init(data, which);
}
{
super("Altos Graph");
init(data, which);
}
- private void init(
Iterable<AltosDataPoint>
data, int which) {
+ private void init(
AltosDataPointReader
data, int which) {
AltosGraph graph = createGraph(data, which);
JFreeChart chart = graph.createChart();
AltosGraph graph = createGraph(data, which);
JFreeChart chart = graph.createChart();