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

[fw/altos] / altosuilib / AltosUISeries.java

diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index b0632d18937bb2840efbb2cc7fd2c522e59f4f7c..aa598bac109b6b89e6f2578244c71cbb1fc51c05 100644 (file)
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.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_2;
+package org.altusmetrum.altosuilib_11;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_11.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -69,12 +70,14 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
                String  example = units.graph_format(7);
 
                ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})",
-                                                                  units.show_units()),
+                                                                  units.graph_units()),
                                                     new java.text.DecimalFormat(time_example),
                                                     new java.text.DecimalFormat(example));
                renderer.setBaseToolTipGenerator(ttg);
        }
 
+       public boolean need_reset() { return true; }
+
        public void set_enable(boolean enable) {
                if (this.enable != enable) {
                        this.enable = enable;
@@ -85,7 +88,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 
        public void add(AltosUIDataPoint dataPoint) {
                try {
-                       super.add(dataPoint.x(), units.value(dataPoint.y(fetch)));
+                       super.add(dataPoint.x(), units.graph_value(dataPoint.y(fetch)));
                } catch (AltosUIDataMissing dm) {
                }
        }