altoslib: Keep time series in AltosFlightSeries array sorted

This makes using the graph way easier.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index 315e0a44d6fbd39924d5168acd9df53f844dc1d0..5223a5b406da20dbd4e2b5bfee3a733c640e0424 100644 (file)
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -118,6 +118,12 @@ public class AltosFlightSeries extends AltosDataListener {
        }
 
        public void add_series(AltosTimeSeries s) {
+               for (int e = 0; e < series.size(); e++) {
+                       if (s.compareTo(series.get(e)) < 0){
+                               series.add(e, s);
+                               return;
+                       }
+               }
                series.add(s);
        }
 

diff --git a/altoslib/AltosTimeSeries.java b/altoslib/AltosTimeSeries.java
index db33fafa56a088c1e05910229fb7029802da13c5..5cf46c9ab888038ca2dd937aafdbcb1d340b2839 100644 (file)
--- a/altoslib/AltosTimeSeries.java
+++ b/altoslib/AltosTimeSeries.java
@@ -16,11 +16,15 @@ package org.altusmetrum.altoslib_11;
 
 import java.util.*;
 
-public class AltosTimeSeries implements Iterable<AltosTimeValue> {
+public class AltosTimeSeries implements Iterable<AltosTimeValue>, Comparable<AltosTimeSeries> {
        public String                   label;
        public AltosUnits               units;
        ArrayList<AltosTimeValue>       values;
 
+       public int compareTo(AltosTimeSeries other) {
+               return label.compareTo(other.label);
+       }
+
        public void add(AltosTimeValue tv) {
                values.add(tv);
        }