X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIUnitsIndicator.java;h=dc5cb11c6c6f8bb728c58491ca42969e95076267;hp=433cc0c25f603c447cf063dca199e97b526090f3;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=7ed63b6c3d5878a59f52f4114b5b01942735805f

diff --git a/altosuilib/AltosUIUnitsIndicator.java b/altosuilib/AltosUIUnitsIndicator.java
index 433cc0c2..dc5cb11c 100644
--- a/altosuilib/AltosUIUnitsIndicator.java
+++ b/altosuilib/AltosUIUnitsIndicator.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,24 +16,41 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_11;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_11.*;
 
 public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
 
 	AltosUnits	units;
 
 	abstract public double value(AltosState state, int i);
-	public boolean good(double value) { return false; }
+	public double good() { return 0; }
+	public boolean good(double value) { return value != AltosLib.MISSING && value >= good(); }
+	public boolean hide(double value) { return false; }
+
+	public boolean hide(AltosState state, int i) {
+		if (state == null)
+			return hide(AltosLib.MISSING);
+		return hide(value(state, i));
+	}
+
+	public boolean hide(AltosState state, AltosListenerState listener_state, int i) {
+		return hide(state, i);
+	}
+
+	public double value (AltosState state, AltosListenerState listener_state, int i) {
+		return value(state, i);
+	}
 
 	public double[] last_values;
 
-	public void show(double... v) {
+	private void show(boolean force, double... v) {
+		show();
 		for (int i = 0; i < values.length; i++) {
-			if (v[i] != last_values[i]) {
+			if (force || v[i] != last_values[i]) {
 				String	value_text;
 				boolean	good = false;
 
@@ -51,29 +69,65 @@ public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
 		}
 	}
 
+	boolean hide = false;
+
+	public void show(double... v) {
+		show(false, v);
+	}
+
 	public void units_changed(boolean imperial_units) {
-		show(last_values);
+		if (!hide)
+			show(true, last_values);
 	}
 
 	public void show (AltosState state, AltosListenerState listener_state) {
-
 		double[] v = new double[values.length];
 
 		for (int i = 0; i < values.length; i++) {
 			if (state != null)
-				v[i] = value(state, i);
+				v[i] = value(state, listener_state, i);
 			else
 				v[i] = AltosLib.MISSING;
+			if (hide(state, listener_state, i))
+				hide = true;
 		}
-		show(v);
 
+		if (hide)
+			hide();
+		else
+			show(v);
 	}
 
-	public AltosUIUnitsIndicator (Container container, int y, AltosUnits units, String name, int number_values, boolean has_lights, int width) {
-		super(container, y, name, number_values, has_lights, width);
+	public void reset() {
+		for (int i = 0; i < last_values.length; i++)
+			last_values[i] = AltosLib.MISSING;
+	}
+
+	public AltosUIUnitsIndicator (Container container, int x, int y, int label_width, AltosUnits units, String name, int number_values, boolean has_lights, int width) {
+		super(container, x, y, label_width, name, number_values, has_lights, width);
 		this.units = units;
 		last_values = new double[values.length];
 		for (int i = 0; i < last_values.length; i++)
-			last_values[i] = AltosLib.MISSING - 1;
+			last_values[i] = AltosLib.MISSING;
+	}
+
+	public AltosUIUnitsIndicator (Container container, int x, int y, AltosUnits units, String name, int number_values, boolean has_lights, int width) {
+		this(container, x, y, 1, units, name, number_values, has_lights, width);
+	}
+
+	public AltosUIUnitsIndicator (Container container, int y, AltosUnits units, String name, int number_values, boolean has_lights, int width) {
+		this(container, 0, y, units, name, number_values, has_lights, width);
+	}
+
+	public AltosUIUnitsIndicator (Container container, int y, AltosUnits units, String name, int width) {
+		this(container, 0, y, units, name, 1, false, width);
+	}
+
+	public AltosUIUnitsIndicator (Container container, int y, AltosUnits units, String name) {
+		this(container, 0, y, units, name, 1, false, 1); 
+	}
+
+	public AltosUIUnitsIndicator (Container container, int x,int y, AltosUnits units, String name) {
+		this(container, x, y, units, name, 1, false, 1); 
 	}
 }