X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphTime.java;h=0955f6e6e444883e07774bfdd1f9c9afb5f33f0c;hp=a5451280ca9d0d4a486e8f95b5edcfb430868c0f;hb=95268d681c9a6652d84db383f55a4fe8a4ac5173;hpb=3fbefb3eea981d34a09496cf8abf0119de2e35bf

diff --git a/altosui/AltosGraphTime.java b/altosui/AltosGraphTime.java
index a5451280..0955f6e6 100644
--- a/altosui/AltosGraphTime.java
+++ b/altosui/AltosGraphTime.java
@@ -4,9 +4,15 @@
 
 package altosui;
 
+import java.lang.*;
+import java.io.*;
+import java.util.concurrent.*;
+import java.util.*;
+import java.text.*;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
+import org.altusmetrum.AltosLib.*;
 
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
@@ -98,9 +104,10 @@ class AltosGraphTime extends AltosGraph {
     }
 
     static class StateMarker implements Element {
-        private double val = Double.NaN;
+	private LinkedList<Double> times = new LinkedList<Double>();
         private String name;
         private int state;
+	private int prev_state = Altos.ao_flight_startup;
 
         StateMarker(int state, String name) {
             this.state = state;
@@ -109,22 +116,19 @@ class AltosGraphTime extends AltosGraph {
 
         public void attachGraph(AltosGraphTime g) { return; }
         public void gotTimeData(double time, AltosDataPoint d) {
-            if (Double.isNaN(val) || time < val) {
-                if (d.state() == state) {
-                    val = time;
-                }
-            }
+	    if (prev_state != state && d.state() == state)
+		times.add(time);
+	    prev_state = d.state();
         }
 
         public void addToPlot(AltosGraphTime g, XYPlot plot) {
-            if (Double.isNaN(val))
-                return;
-
-            ValueMarker m = new ValueMarker(val);
-            m.setLabel(name);
-            m.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
-            m.setLabelTextAnchor(TextAnchor.TOP_LEFT);
-            plot.addDomainMarker(m);
+	    for (double time : times) {
+		ValueMarker m = new ValueMarker(time);
+		m.setLabel(name);
+		m.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
+		m.setLabelTextAnchor(TextAnchor.TOP_LEFT);
+		plot.addDomainMarker(m);
+	    }
         }
     }
 
@@ -132,7 +136,6 @@ class AltosGraphTime extends AltosGraph {
     private Integer serial = null;
     private Integer flight = null; 
 
-    private String title;
     private ArrayList<Element> elements;
     private HashMap<String,Integer> axes;
     private HashMap<Element,Integer> datasets;