X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIAxis.java;h=75722d12bea000c34de25414e356ac91e7feb3e7;hp=155e7ed6d4b44d349f3166f00707582e6129f9f7;hb=76b288f8d02e0a48f04de9455a2dd0b77e48bd63;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 155e7ed6..75722d12 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_8;
+package org.altusmetrum.altosuilib_14;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altoslib_14.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -35,12 +36,12 @@ import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
 public class AltosUIAxis extends NumberAxis {
-	String		label;
-	AltosUnits	units;
-	Color		color;
-	int		ref;
-	int		visible;
-	int		index;
+	String			label;
+	AltosUnits		units;
+	AltosUILineStyle	line_style;
+	int			ref;
+	int			visible;
+	int			index;
 
 	public final static int	axis_integer = 1;
 	public final static int axis_include_zero = 2;
@@ -48,11 +49,14 @@ public class AltosUIAxis extends NumberAxis {
 	public final static int axis_default = axis_include_zero;
 
 	public void set_units() {
-		String u = units.show_units();
-		if (u != null)
-			setLabel(String.format("%s (%s)", label, u));
-		else
-			setLabel(label);
+		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) {
@@ -78,21 +82,22 @@ public class AltosUIAxis extends NumberAxis {
 		}
 	}
 
-	public AltosUIAxis(String label, AltosUnits units, Color color, int index, int flags) {
+	public AltosUIAxis(String label, AltosUnits units, AltosUILineStyle line_style, int index, int flags) {
 		this.label = label;
 		this.units = units;
+		this.line_style = line_style;
 		this.index = index;
 		this.visible = 0;
 		this.ref = 0;
-		setLabelPaint(color);
-		setTickLabelPaint(color);
+		setLabelPaint(line_style.color);
+		setTickLabelPaint(line_style.color);
 		setVisible(false);
 		if ((flags & axis_integer) != 0)
 			setStandardTickUnits(NumberAxis.createIntegerTickUnits());
 		setAutoRangeIncludesZero((flags & axis_include_zero) != 0);
 	}
 
-	public AltosUIAxis(String label, AltosUnits units, Color color, int index) {
-		this(label, units, color, index, axis_default);
+	public AltosUIAxis(String label, AltosUnits units, AltosUILineStyle line_style, int index) {
+		this(label, units, line_style, index, axis_default);
 	}
 }