X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMag.java;h=ab5d3f57e38cb5385350f673912b1df35b566c73;hp=ec98882f2e0513629fa3e25395d814b120a9b757;hb=ec46adee44ea08120b1940ca55a5fbdf56874bb1;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index ec98882f..ab5d3f57 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.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,15 +16,15 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
-	public int		along;
-	public int		across;
-	public int		through;
+public class AltosMag implements Cloneable {
+	public int		x;
+	public int		z;
+	public int		y;
 
 	public static final double counts_per_gauss = 1090;
 
@@ -32,10 +33,6 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
 	}
 
 	public boolean parse_string(String line) {
-//		if (line.startsWith("Syntax error")) {
-//			along = across = through = 0;
-//			return true;
-//		}
 
 		if (!line.startsWith("X:"))
 			return false;
@@ -43,9 +40,9 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
 		String[] items = line.split("\\s+");
 
 		if (items.length >= 6) {
-			along = Integer.parseInt(items[1]);
-			across = Integer.parseInt(items[3]);
-			through = Integer.parseInt(items[5]);
+			x = Integer.parseInt(items[1]);
+			z = Integer.parseInt(items[3]);
+			y = Integer.parseInt(items[5]);
 		}
 		return true;
 	}
@@ -53,30 +50,27 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
 	public AltosMag clone() {
 		AltosMag n = new AltosMag();
 
-		n.along = along;
-		n.across = across;
-		n.through = through;
+		n.x = x;
+		n.z = z;
+		n.y = y;
 		return n;
 	}
 
 	public AltosMag() {
-		along = AltosLib.MISSING;
-		across = AltosLib.MISSING;
-		through = AltosLib.MISSING;
+		x = AltosLib.MISSING;
+		z = AltosLib.MISSING;
+		y = AltosLib.MISSING;
 	}
 
-	public AltosMag(int along, int across, int through) {
-		this.along = along;
-		this.across = across;
-		this.through = through;
-	}
-
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+	static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
 		try {
 			AltosMag	mag = new AltosMag(link);
+			AltosCalData	cal_data = listener.cal_data();
 
 			if (mag != null)
-				state.set_mag(mag);
+				listener.set_mag(cal_data.mag_along(mag.y),
+						 cal_data.mag_across(mag.x),
+						 cal_data.mag_through(mag.z));
 		} catch (TimeoutException te) {
 		}
 	}
@@ -93,52 +87,4 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
 				break;
 		}
 	}
-
-	public AltosHashSet hashSet() {
-		AltosHashSet	h = new AltosHashSet();
-
-		h.putInt("along", along);
-		h.putInt("across", across);
-		h.putInt("through", through);
-		return h;
-	}
-
-	public AltosJson json() {
-		AltosJson	j = new AltosJson();
-
-		j.put("along", along);
-		j.put("across", across);
-		j.put("through", through);
-		return j;
-	}
-
-	public AltosMag(AltosHashSet h) {
-		this();
-
-		along = h.getInt("along", along);
-		across = h.getInt("across", across);
-		through = h.getInt("through", through);
-	}
-
-	public static AltosMag fromHashSet(AltosHashSet h, AltosMag def) {
-		if (h == null)
-			return def;
-
-		return new AltosMag(h);
-	}
-
-	public AltosMag(AltosJson j) {
-		this();
-
-		along = j.get_int("along", along);
-		across = j.get_int("across", across);
-		through = j.get_int("through", through);
-	}
-
-	public static AltosMag fromJson(AltosJson j, AltosMag def) {
-		if (j == null)
-			return def;
-
-		return new AltosMag(j);
-	}
 }