projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Rename AltosEepromNew to AltosEeprom
[fw/altos]
/
altosuilib
/
AltosUIGraphNew.java
diff --git
a/altosuilib/AltosUIGraphNew.java
b/altosuilib/AltosUIGraphNew.java
index acfcd23ddd00478e381d18b09c2f9b9283a7a7a8..b820518d06e79b8f0d656791e011f132deff6978 100644
(file)
--- a/
altosuilib/AltosUIGraphNew.java
+++ b/
altosuilib/AltosUIGraphNew.java
@@
-68,7
+68,6
@@
public class AltosUIGraphNew implements AltosUnitsListener {
void addAxis(AltosUIAxis axis) {
if (!axes_added.containsKey(axis.index)) {
void addAxis(AltosUIAxis axis) {
if (!axes_added.containsKey(axis.index)) {
- System.out.printf("Add axis %s %d\n", axis.label, axis_index);
axes_added.put(axis.index, true);
plot.setRangeAxis(axis.index, axis);
}
axes_added.put(axis.index, true);
plot.setRangeAxis(axis.index, axis);
}
@@
-88,12
+87,8
@@
public class AltosUIGraphNew implements AltosUnitsListener {
series_index++;
}
series_index++;
}
-/*
- public void addMarker(String label, int fetch, Color color) {
- AltosUIMarker marker = new AltosUIMarker(fetch, color, plot);
- this.graphers.add(marker);
+ public void addMarker(AltosUITimeSeries series) {
}
}
-*/
public void units_changed(boolean imperial_units) {
for (AltosUITimeSeries s : series)
public void units_changed(boolean imperial_units) {
for (AltosUITimeSeries s : series)
@@
-106,6
+101,15
@@
public class AltosUIGraphNew implements AltosUnitsListener {
public void set_series(AltosUITimeSeries[] series) {
this.series = series;
public void set_series(AltosUITimeSeries[] series) {
this.series = series;
+ boolean any_enabled = false;
+
+ for (AltosUITimeSeries s : series)
+ if (s.enable)
+ any_enabled = true;
+
+ if (!any_enabled)
+ for (AltosUITimeSeries s : series)
+ s.set_enable(true);
for (AltosUITimeSeries s : series)
addSeries(s);
for (AltosUITimeSeries s : series)
addSeries(s);
@@
-131,7
+135,7
@@
public class AltosUIGraphNew implements AltosUnitsListener {
plot.setDomainPannable(true);
plot.setRangePannable(true);
plot.setDomainPannable(true);
plot.setRangePannable(true);
- chart = new JFreeChart(
"Flight"
, JFreeChart.DEFAULT_TITLE_FONT,
+ chart = new JFreeChart(
title
, JFreeChart.DEFAULT_TITLE_FONT,
plot, true);
ChartUtilities.applyCurrentTheme(chart);
plot, true);
ChartUtilities.applyCurrentTheme(chart);