X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIAxis.java;h=e8c315182fb0255467f6a31c485b2c3416b9f1d8;hp=70084a0096b214c85f75fce4bde2971ee11dc2a6;hb=9748d267b80e42ca52f9221900bb58602759a8d2;hpb=bf88c5f829ea5d32043431945e862a9f6c96740a

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 70084a00..e8c31518 100644
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.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.*;
@@ -48,9 +49,16 @@ public class AltosUIAxis extends NumberAxis {
 	public final static int axis_default = axis_include_zero;
 
 	public void set_units() {
-		setLabel(String.format("%s (%s)", label, units.show_units()));
+		if (units != null) {
+			String u = units.parse_units();
+			if (u != null) {
+				setLabel(String.format("%s (%s)", label, u));
+				return;
+			}
+		}
+		setLabel(label);
 	}
-	
+
 	public void set_enable(boolean enable) {
 		if (enable) {
 			visible++;
@@ -62,6 +70,8 @@ public class AltosUIAxis extends NumberAxis {
 				System.out.printf("too few visible\n");
 		}
 		setVisible(visible > 0);
+		if (enable)
+			autoAdjustRange();
 	}
 
 	public void ref(boolean enable) {