X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSV.java;h=f8cc1ed6b1d12240a34ee74a7b28bfbc1018564c;hp=be86a4544855d602655646b39b6664d7dd405290;hb=382c54a0d052c8975b57c995ef83bc8934bde242;hpb=3c2f601139d36761de6a8a2210545d082ef16133 diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java index be86a454..f8cc1ed6 100644 --- a/altosui/AltosCSV.java +++ b/altosui/AltosCSV.java @@ -17,9 +17,7 @@ package altosui; -import java.lang.*; import java.io.*; -import java.text.*; import java.util.*; import org.altusmetrum.AltosLib.*; @@ -146,8 +144,8 @@ 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(); @@ -263,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(","); @@ -287,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; }