projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index 690241f13e53c98ed97da0a8a76a0ef2c51aaaf6..5864529fe4f175683ef04149c9812443506b7a37 100644
(file)
--- a/
altoslib/AltosMag.java
+++ b/
altoslib/AltosMag.java
@@
-15,24
+15,25
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
11
;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import java.io.*;
public class AltosMag implements Cloneable {
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")) {
}
public boolean parse_string(String line) {
// if (line.startsWith("Syntax error")) {
-//
x = y = z
= 0;
+//
along = across = through
= 0;
// return true;
// }
// return true;
// }
@@
-42,9
+43,9
@@
public class AltosMag implements Cloneable {
String[] items = line.split("\\s+");
if (items.length >= 6) {
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;
}
}
return true;
}
@@
-52,16
+53,22
@@
public class AltosMag implements Cloneable {
public AltosMag clone() {
AltosMag n = new AltosMag();
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() {
return n;
}
public AltosMag() {
- x = AltosLib.MISSING;
- y = AltosLib.MISSING;
- z = AltosLib.MISSING;
+ along = AltosLib.MISSING;
+ across = AltosLib.MISSING;
+ through = 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 update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {