X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIMarker.java;h=63e8102410686e8446c7eaec1731aa7873707dd0;hp=560153f285f64a53f13d6aa4958121095708f5d7;hb=adf4bec88df1822031e1a8b00422de8b8b0c0cd4;hpb=0169e56ad030c0096b1068d00f06957990dfb31f

diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java
index 560153f2..63e81024 100644
--- a/altosuilib/AltosUIMarker.java
+++ b/altosuilib/AltosUIMarker.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_13;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_13.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -41,7 +42,7 @@ public class AltosUIMarker implements AltosUIGrapher {
 	boolean			enabled;
 	int			fetch;
 	Color			color;
-	
+
 	private void remove_markers() {
 		for (ValueMarker marker : markers)
 			plot.removeDomainMarker(marker);
@@ -55,6 +56,8 @@ public class AltosUIMarker implements AltosUIGrapher {
 	public void set_units() {
 	}
 
+	public boolean need_reset() { return true; }
+
 	public void set_enable(boolean enable) {
 		if (enabled == enable)
 			return;
@@ -72,20 +75,23 @@ public class AltosUIMarker implements AltosUIGrapher {
 	}
 
 	public void add(AltosUIDataPoint dataPoint) {
-		int id = dataPoint.id(fetch);
-		if (id < 0)
-			return;
-		if (id == last_id)
-			return;
-		ValueMarker marker = new ValueMarker(dataPoint.x());
-		marker.setLabel(dataPoint.id_name(fetch));
-		marker.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
-		marker.setLabelTextAnchor(TextAnchor.TOP_LEFT);
-		marker.setPaint(color);
-		if (enabled)
-			plot.addDomainMarker(marker);
-		markers.add(marker);
-		last_id = id;
+		try {
+			int id = dataPoint.id(fetch);
+			if (id < 0)
+				return;
+			if (id == last_id)
+				return;
+			ValueMarker marker = new ValueMarker(dataPoint.x());
+			marker.setLabel(dataPoint.id_name(fetch));
+			marker.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
+			marker.setLabelTextAnchor(TextAnchor.TOP_LEFT);
+			marker.setPaint(color);
+			if (enabled)
+				plot.addDomainMarker(marker);
+			markers.add(marker);
+			last_id = id;
+		} catch (AltosUIDataMissing m) {
+		}
 	}
 
 	public AltosUIMarker (int fetch, Color color, XYPlot plot, boolean enable) {
@@ -97,7 +103,13 @@ public class AltosUIMarker implements AltosUIGrapher {
 		this.enabled = enable;
 	}
 
+	public void setNotify(boolean notify) {
+	}
+
+	public void fireSeriesChanged() {
+	}
+
 	public AltosUIMarker (int fetch, Color color, XYPlot plot) {
 		this(fetch, color, plot, true);
 	}
-}
\ No newline at end of file
+}