diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
| commit | c0ad087008856cfc2233b977abfc3f1dcbaccdcc (patch) | |
| tree | adc46abc430793112858ce5d1822d3fe0a395e71 /altosui/AltosUI.java | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altosui/AltosUI.java')
| -rw-r--r-- | altosui/AltosUI.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index fa259906..019bbb9e 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.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 @@ -545,14 +546,22 @@ public class AltosUI extends AltosUIFrame { AltosStateIterable eef = record_iterable(file); for (AltosState state : eef) { - System.out.printf ("tick %d state %d height %g\n", - state.tick, state.state(), state.height()); - if ((state.set & AltosState.set_gps) != 0) - System.out.printf ("time %g lat %g lon %g alt %g\n", - state.time_since_boost(), + if ((state.set & AltosState.set_gps) != 0) { + System.out.printf ("time %d %d-%d-%d %d:%d:%d lat %g lon %g alt %g\n", + state.gps.seconds(), + state.gps.year, + state.gps.month, + state.gps.day, + state.gps.hour, + state.gps.minute, + state.gps.second, state.gps.lat, state.gps.lon, state.gps.alt); + } else { + System.out.printf ("tick %d state %d height %g\n", + state.tick, state.state(), state.height()); + } } } catch (Exception e) { |