X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMag.java;h=c350ae46392f4ddd637b58fe8f34c0c825a9faf1;hb=2a4d741872449b5332f28e018fa3acc53ed7d891;hp=56add8f3445da8d0de9fee7d2ec2f5150d4ee739;hpb=488a527267decece48e6682e0e0c7fc29cbed329;p=fw%2Faltos

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 56add8f3..c350ae46 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,25 +15,37 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
+import java.io.*;
 
-public class AltosMag implements Cloneable {
-	public int		x;
-	public int		y;
-	public int		z;
+public class AltosMag implements Cloneable, AltosHashable {
+	public int		along;
+	public int		across;
+	public int		through;
+
+	public static final double counts_per_gauss = 1090;
+
+	public static double convert_gauss(double counts) {
+		return counts / counts_per_gauss;
+	}
 
 	public boolean parse_string(String line) {
+//		if (line.startsWith("Syntax error")) {
+//			along = across = through = 0;
+//			return true;
+//		}
+
 		if (!line.startsWith("X:"))
 			return false;
 
 		String[] items = line.split("\\s+");
 
 		if (items.length >= 6) {
-			x = Integer.parseInt(items[1]);
-			y = Integer.parseInt(items[3]);
-			z = Integer.parseInt(items[5]);
+			along = Integer.parseInt(items[1]);
+			across = Integer.parseInt(items[3]);
+			through = Integer.parseInt(items[5]);
 		}
 		return true;
 	}
@@ -41,26 +53,31 @@ public class AltosMag implements Cloneable {
 	public AltosMag clone() {
 		AltosMag n = new AltosMag();
 
-		n.x = x;
-		n.y = y;
-		n.z = z;
+		n.along = along;
+		n.across = across;
+		n.through = through;
 		return n;
 	}
 
 	public AltosMag() {
-		x = AltosLib.MISSING;
-		y = AltosLib.MISSING;
-		z = AltosLib.MISSING;
+		along = AltosLib.MISSING;
+		across = AltosLib.MISSING;
+		through = AltosLib.MISSING;
 	}
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+	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 {
 		try {
 			AltosMag	mag = new AltosMag(link);
 
 			if (mag != null)
 				state.set_mag(mag);
 		} catch (TimeoutException te) {
-		} catch (InterruptedException ie) {
 		}
 	}
 
@@ -76,5 +93,28 @@ public class AltosMag implements Cloneable {
 				break;
 		}
 	}
+
+	public AltosHashSet hashSet() {
+		AltosHashSet	h = new AltosHashSet();
+
+		h.putInt("along", along);
+		h.putInt("across", across);
+		h.putInt("through", through);
+		return h;
+	}
+
+	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);
+	}
 }
-	
\ No newline at end of file