Merge remote branch 'aj/master'

1 files changed, 14 insertions, 0 deletions

diff --git a/ao-tools/altosui/AltosGraphTime.java b/ao-tools/altosui/AltosGraphTime.java
index c0f99c59..ab01b888 100644
--- a/ao-tools/altosui/AltosGraphTime.java
+++ b/ao-tools/altosui/AltosGraphTime.java
@@ -131,6 +131,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;
@@ -186,6 +190,9 @@ class AltosGraphTime extends AltosGraph {
         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() {
@@ -197,6 +204,13 @@ class AltosGraphTime extends AltosGraph {
         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);