altoslib: Move temp GPS API from cal_data to data_listener

[fw/altos] / altosuilib / AltosUITimeSeries.java

diff --git a/altosuilib/AltosUITimeSeries.java b/altosuilib/AltosUITimeSeries.java
index 7c48264e25092953bbfbb9a4caef7cecb351ee2e..b98c83768f057e7084c48b7fcdd55ab2cd860e19 100644 (file)
--- a/altosuilib/AltosUITimeSeries.java
+++ b/altosuilib/AltosUITimeSeries.java
@@ -16,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_12;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_12.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -35,6 +35,24 @@ import org.jfree.chart.labels.*;
 import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
+class AltosUITime extends AltosUnits {
+       public double value(double v, boolean imperial_units) { return v; }
+
+       public double inverse(double v, boolean imperial_unis) { return v; }
+
+       public String show_units(boolean imperial_units) { return "s"; }
+
+       public String say_units(boolean imperial_units) { return "seconds"; }
+
+       public int show_fraction(int width, boolean imperial_units) {
+               if (width < 5)
+                       return 0;
+               return width - 5;
+       }
+
+       public int say_fraction(boolean imperial_units) { return 0; }
+}
+
 class AltosXYSeries extends XYSeries {
 
        public AltosXYSeries(String label) {
@@ -48,7 +66,7 @@ public class AltosUITimeSeries extends AltosTimeSeries implements AltosUIGrapher
        AltosUIAxis     axis;
        boolean         marker;
        boolean         marker_top;
-       XYItemRenderer  renderer;
+       XYLineAndShapeRenderer  renderer;
        XYPlot          plot;
        AltosXYSeries   xy_series;
        ArrayList<ValueMarker>  markers;
@@ -71,7 +89,7 @@ public class AltosUITimeSeries extends AltosTimeSeries implements AltosUIGrapher
        public void fireSeriesChanged() {
        }
 
-       void set_data() {
+       public void set_data() {
                if (marker) {
                        if (markers != null) {
                                for (ValueMarker marker : markers)
@@ -106,6 +124,7 @@ public class AltosUITimeSeries extends AltosTimeSeries implements AltosUIGrapher
                        }
                        xy_series.setNotify(true);
                }
+               clear_changed();
        }
 
        public void set_units() {
@@ -169,6 +188,10 @@ public class AltosUITimeSeries extends AltosTimeSeries implements AltosUIGrapher
                this.marker_top = marker_top;
        }
 
+       public void set_shapes_visible(boolean shapes_visible) {
+               renderer.setSeriesShapesVisible(0, shapes_visible);
+       }
+
        public AltosUITimeSeries(String label, AltosUnits units) {
                super(label, units);
        }