X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSV.java;h=f8cc1ed6b1d12240a34ee74a7b28bfbc1018564c;hp=b88bedba2f512e60532acafaa7cc7d0248135e43;hb=382c54a0d052c8975b57c995ef83bc8934bde242;hpb=1824761f5b98e92485e2dd347b1c4d043ec207e2

diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index b88bedba..f8cc1ed6 100644
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -17,10 +17,9 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.text.*;
 import java.util.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosCSV implements AltosWriter {
 	File			name;
@@ -145,14 +144,14 @@ public class AltosCSV implements AltosWriter {
 	}
 
 	void write_advanced(AltosRecord record) {
-		AltosIMU	imu = record.imu;
-		AltosMag	mag = record.mag;
+		AltosIMU	imu = record.imu();
+		AltosMag	mag = record.mag();
 
 		if (imu == null)
 			imu = new AltosIMU();
 		if (mag == null)
 			mag = new AltosMag();
-		out.printf("%d,%d,%d,%d,%d,%d,%d,%d,%d",
+		out.printf("%6d,%6d,%6d,%6d,%6d,%6d,%6d,%6d,%6d",
 			   imu.accel_x, imu.accel_y, imu.accel_z,
 			   imu.gyro_x, imu.gyro_y, imu.gyro_z,
 			   mag.x, mag.y, mag.z);
@@ -262,7 +261,7 @@ public class AltosCSV implements AltosWriter {
 		write_general(record); out.printf(",");
 		write_flight(record); out.printf(",");
 		write_basic(record); out.printf(",");
-		if (record.imu != null || record.mag != null)
+		if (record.imu() != null || record.mag() != null)
 			write_advanced(record);
 		if (record.gps != null) {
 			out.printf(",");
@@ -286,7 +285,7 @@ public class AltosCSV implements AltosWriter {
 		if (record.state == Altos.ao_flight_startup)
 			return;
 		if (!header_written) {
-			write_header(record.imu != null || record.mag != null,
+			write_header(record.imu() != null || record.mag() != null,
 				     record.gps != null, record.companion != null);
 			header_written = true;
 		}