projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Hide inactive altimeter configuration entries
[fw/altos]
/
altosuilib
/
AltosGraph.java
diff --git
a/altosuilib/AltosGraph.java
b/altosuilib/AltosGraph.java
index 73c53a2284c4a3155db56a29df5e391f8a0291e4..292437de9879f52076742f0ff42cc77d1de9bb66 100644
(file)
--- a/
altosuilib/AltosGraph.java
+++ b/
altosuilib/AltosGraph.java
@@
-15,14
+15,14
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_
2
;
+package org.altusmetrum.altosuilib_
3
;
import java.io.*;
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import java.io.*;
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altoslib_
5
.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
@@
-333,19
+333,22
@@
public class AltosGraph extends AltosUIGraph {
dbm_color,
false,
dbm_axis);
dbm_color,
false,
dbm_axis);
- if (stats.has_other_adc) {
- addSeries("Temperature",
- AltosGraphDataPoint.data_temperature,
- AltosConvert.temperature,
- temperature_color,
- false,
- temperature_axis);
+
+ if (stats.has_battery)
addSeries("Battery Voltage",
AltosGraphDataPoint.data_battery_voltage,
voltage_units,
battery_voltage_color,
false,
voltage_axis);
addSeries("Battery Voltage",
AltosGraphDataPoint.data_battery_voltage,
voltage_units,
battery_voltage_color,
false,
voltage_axis);
+
+ if (stats.has_flight_adc) {
+ addSeries("Temperature",
+ AltosGraphDataPoint.data_temperature,
+ AltosConvert.temperature,
+ temperature_color,
+ false,
+ temperature_axis);
addSeries("Drogue Voltage",
AltosGraphDataPoint.data_drogue_voltage,
voltage_units,
addSeries("Drogue Voltage",
AltosGraphDataPoint.data_drogue_voltage,
voltage_units,