projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AltosSiteMap: explain tile size better
[fw/altos]
/
ao-tools
/
altosui
/
AltosGraphTime.java
diff --git
a/ao-tools/altosui/AltosGraphTime.java
b/ao-tools/altosui/AltosGraphTime.java
index c0f99c596d939381a4d483772e8e018b037fa240..a5451280ca9d0d4a486e8f95b5edcfb430868c0f 100644
(file)
--- a/
ao-tools/altosui/AltosGraphTime.java
+++ b/
ao-tools/altosui/AltosGraphTime.java
@@
-24,9
+24,6
@@
import org.jfree.data.xy.XYSeriesCollection;
import org.jfree.ui.RectangleAnchor;
import org.jfree.ui.TextAnchor;
import org.jfree.ui.RectangleAnchor;
import org.jfree.ui.TextAnchor;
-import altosui.AltosDataPoint;
-import altosui.AltosGraph;
-
class AltosGraphTime extends AltosGraph {
static interface Element {
void attachGraph(AltosGraphTime g);
class AltosGraphTime extends AltosGraph {
static interface Element {
void attachGraph(AltosGraphTime g);
@@
-131,6
+128,10
@@
class AltosGraphTime extends AltosGraph {
}
}
}
}
+ private String callsign = null;
+ private Integer serial = null;
+ private Integer flight = null;
+
private String title;
private ArrayList<Element> elements;
private HashMap<String,Integer> axes;
private String title;
private ArrayList<Element> elements;
private HashMap<String,Integer> axes;
@@
-186,6
+187,9
@@
class AltosGraphTime extends AltosGraph {
for (Element e : elements) {
e.gotTimeData(time, d);
}
for (Element e : elements) {
e.gotTimeData(time, d);
}
+ if (callsign == null) callsign = d.callsign();
+ if (serial == null) serial = new Integer(d.serial());
+ if (flight == null) flight = new Integer(d.flight());
}
public JFreeChart createChart() {
}
public JFreeChart createChart() {
@@
-197,6
+201,13
@@
class AltosGraphTime extends AltosGraph {
plot.setRenderer(renderer);
plot.setOrientation(PlotOrientation.VERTICAL);
plot.setRenderer(renderer);
plot.setOrientation(PlotOrientation.VERTICAL);
+ if (serial != null && flight != null) {
+ title = serial + "/" + flight + ": " + title;
+ }
+ if (callsign != null) {
+ title = callsign + " - " + title;
+ }
+
renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
plot, true);
renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
plot, true);