X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMag.java;h=523a31a5edb90f8076a52db1863792c806fbfb4a;hb=4c5acb57d7ac1abec7bb4cda9dc88c2a19767a2d;hp=5136bfd20f13b60312082f27b4d1ce02118b8a9e;hpb=91bcfae2e64ecb2e7de1292b264910382b635aea;p=fw%2Faltos

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 5136bfd2..523a31a5 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,24 +16,25 @@
  * 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 double		x;
-	public double		y;
-	public double		z;
+	public int		along;
+	public int		across;
+	public int		through;
 
-	public static double counts_per_gauss = 1090;
+	public static final double counts_per_gauss = 1090;
 
-	public static double convert_gauss(int counts) {
-		return (double) counts / counts_per_gauss;
+	public static double convert_gauss(double counts) {
+		return counts / counts_per_gauss;
 	}
 
 	public boolean parse_string(String line) {
 //		if (line.startsWith("Syntax error")) {
-//			x = y = z = 0;
+//			along = across = through = 0;
 //			return true;
 //		}
 
@@ -42,9 +44,9 @@ public class AltosMag implements Cloneable {
 		String[] items = line.split("\\s+");
 
 		if (items.length >= 6) {
-			x = convert_gauss(Integer.parseInt(items[1]));
-			y = convert_gauss(Integer.parseInt(items[3]));
-			z = convert_gauss(Integer.parseInt(items[5]));
+			along = Integer.parseInt(items[1]);
+			across = Integer.parseInt(items[3]);
+			through = Integer.parseInt(items[5]);
 		}
 		return true;
 	}
@@ -52,24 +54,32 @@ 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) throws InterruptedException {
+	public AltosMag(int along, int across, int through) {
+		this.along = along;
+		this.across = across;
+		this.through = through;
+	}
+
+	static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
 		try {
 			AltosMag	mag = new AltosMag(link);
 
 			if (mag != null)
-				state.set_mag(mag);
+				listener.set_mag(cal_data.mag_along(mag.along),
+						 cal_data.mag_across(mag.across),
+						 cal_data.mag_through(mag.through));
 		} catch (TimeoutException te) {
 		}
 	}
@@ -87,4 +97,3 @@ public class AltosMag implements Cloneable {
 		}
 	}
 }
-	
\ No newline at end of file