altoslib: Check for valid pad alt before computing GPS height series

[fw/altos] / altosuilib / AltosUIGraph.java

diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index 5c589c02555070637c7d3055cb9c91087f70c848..d37603846595d0bd4fca46e9d9c7967a9377444d 100644 (file)
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_11;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_11.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -82,22 +83,26 @@ public class AltosUIGraph implements AltosUnitsListener {
        public void addSeries(String label, int fetch, AltosUnits units, Color color) {
                addSeries(label, fetch, units, color, true, newAxis(label, units, color));
        }
-       
+
        public void addMarker(String label, int fetch, Color color) {
                AltosUIMarker           marker = new AltosUIMarker(fetch, color, plot);
-               if (enable != null)
-                       enable.add(label, marker, true);
                this.graphers.add(marker);
        }
 
        public void resetData() {
-               for (AltosUIGrapher g : graphers)
+               for (AltosUIGrapher g : graphers) {
                        g.clear();
+                       g.setNotify(false);
+               }
                if (dataSet != null) {
                        for (AltosUIDataPoint dataPoint : dataSet.dataPoints())
                                for (AltosUIGrapher g : graphers)
                                        g.add(dataPoint);
                }
+               for (AltosUIGrapher g : graphers) {
+                       g.setNotify(true);
+                       g.fireSeriesChanged();
+               }
        }
 
        public void units_changed(boolean imperial_units) {
@@ -125,7 +130,7 @@ public class AltosUIGraph implements AltosUnitsListener {
                this.axis_index = 0;
 
                xAxis = new NumberAxis("Time (s)");
-               
+
                xAxis.setAutoRangeIncludesZero(true);
 
                plot = new XYPlot();
@@ -152,4 +157,4 @@ public class AltosUIGraph implements AltosUnitsListener {
 
                AltosPreferences.register_units_listener(this);
        }
-}
\ No newline at end of file
+}