diff options
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/AltosUI.java | 29 | ||||
| -rw-r--r-- | altosui/Makefile.am | 34 | ||||
| -rw-r--r-- | altosui/mdwn.tmpl | 7 |
3 files changed, 58 insertions, 12 deletions
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 4bc2a5f8..bc8eaa71 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -397,7 +397,7 @@ public class AltosUI extends AltosUIFrame { String message = ie.getMessage(); if (message == null) message = String.format("%s (I/O error)", input.toString()); - System.err.printf("%s\n", message); + System.err.printf("%s: %s\n", input.toString(), message); } return null; } @@ -408,6 +408,7 @@ public class AltosUI extends AltosUIFrame { static final int process_graph = 3; static final int process_replay = 4; static final int process_summary = 5; + static final int process_oneline = 6; static boolean process_csv(File input) { AltosRecordSet set = record_set(input); @@ -530,12 +531,32 @@ public class AltosUI extends AltosUIFrame { return true; } + static boolean process_oneline(File file) { + AltosRecordSet set = record_set(file); + if (set == null) + return false; + System.out.printf("%s", file.toString()); + AltosFlightSeries series = make_series(set); + AltosFlightStats stats = new AltosFlightStats(series); + if (stats.max_height != AltosLib.MISSING) + System.out.printf(" height %6.0f m", stats.max_height); + if (stats.max_speed != AltosLib.MISSING) + System.out.printf(" speed %6.0f m/s", stats.max_speed); + if (stats.state_enter_speed[AltosLib.ao_flight_drogue] != AltosLib.MISSING) + System.out.printf(" drogue-deploy %6.0f m/s", stats.state_enter_speed[AltosLib.ao_flight_drogue]); + if (stats.max_acceleration != AltosLib.MISSING) + System.out.printf(" accel %6.0f m/s²", stats.max_acceleration); + System.out.printf("\n"); + return true; + } + public static void help(int code) { System.out.printf("Usage: altosui [OPTION]... [FILE]...\n"); System.out.printf(" Options:\n"); System.out.printf(" --replay <filename>\t\trelive the glory of past flights \n"); System.out.printf(" --graph <filename>\t\tgraph a flight\n"); System.out.printf(" --summary <filename>\t\tText summary of a flight\n"); + System.out.printf(" --oneline <filename>\t\tOne line summary of a flight\n"); System.out.printf(" --csv\tgenerate comma separated output for spreadsheets, etc\n"); System.out.printf(" --kml\tgenerate KML output for use with Google Earth\n"); System.exit(code); @@ -572,6 +593,8 @@ public class AltosUI extends AltosUIFrame { process = process_graph; else if (args[i].equals("--summary")) process = process_summary; + else if (args[i].equals("--oneline")) + process = process_oneline; else if (args[i].startsWith("--")) help(1); else { @@ -600,6 +623,10 @@ public class AltosUI extends AltosUIFrame { if (!process_summary(file)) ++errors; break; + case process_oneline: + if (!process_oneline(file)) + ++errors; + break; } } } diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 31ec06bc..53762aec 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -171,6 +171,8 @@ LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2 LINUX_SH=Altos-Linux-$(VERSION).sh MACOSX_DIST=Altos-Mac-$(VERSION).dmg WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe +MDWN=$(VERSION).mdwn +MDWNTMPL=mdwn.tmpl FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) @@ -185,14 +187,14 @@ MACOSX_EXTRA=$(FIRMWARE) WINDOWS_FILES=$(FAT_FILES) $(FIRMWARE) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(WINDOWS_ICONS) -all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb +all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb $(MDWN) clean-local: -rm -rf classes $(JAR) $(FATJAR) \ Altos-Linux-*.tar.bz2 Altos-Linux-*.sh Altos-Mac-*.dmg Altos-Windows-*.exe \ windows altoslib_*.jar altosuilib_*.jar $(FREETTS_CLASS) \ $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \ - altosui altosui-test altosui-jdb macosx linux *.desktop + altosui altosui-test altosui-jdb macosx linux *.desktop $(MDWN) EXTRA_DIST = $(desktop_file).in @@ -202,18 +204,17 @@ $(desktop_file): $(desktop_file).in if FATINSTALL -FATTARGET=$(FATDIR)/$(VERSION) +FATTARGET=$(FATDIR)/AltOS/releases/$(VERSION) -LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST) LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH) MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST) WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST) +MDWN_TARGET=$(FATDIR)/AltOS/releases/$(MDWN) +RELNOTES=release-notes-$(VERSION).html +RELNOTES_SRC=$(top_builddir)/doc/$(RELNOTES) +RELNOTES_TARGET=$(FATTARGET)/$(RELNOTES) -fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET) - -$(LINUX_DIST_TARGET): $(LINUX_DIST) - mkdir -p $(FATTARGET) - cp -p $< $@ +fat-install: fat $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET) $(MDWN_TARGET) $(RELNOTES_TARGET) $(LINUX_SH_TARGET): $(LINUX_SH) mkdir -p $(FATTARGET) @@ -227,10 +228,21 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST) mkdir -p $(FATTARGET) cp -p $< $@ -else -fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST) +$(MDWN_TARGET): $(MDWN) + mkdir -p $(FATTARGET) + cp -p $< $@ + +$(RELNOTES_TARGET): $(RELNOTES_SRC) + mkdir -p $(FATTARGET) + sh $(top_srcdir)/doc/install-html -d $(FATTARGET) $(RELNOTES_SRC) + endif +$(MDWN): $(MDWNTMPL) + sed -e 's/%version%/$(VERSION)/g' -e 's/%version_dash%/$(VERSION_DASH)/g' $(MDWNTMPL) > $@ + +fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST) + altosuidir=$(datadir)/java install-altosuiJAVA: altosui.jar diff --git a/altosui/mdwn.tmpl b/altosui/mdwn.tmpl new file mode 100644 index 00000000..b64825a6 --- /dev/null +++ b/altosui/mdwn.tmpl @@ -0,0 +1,7 @@ +[[!inline pages="./%version%/release-notes-%version%.html" rss="no" raw="yes" ]] + +- Available Files: + - [Windows Installer](/AltOS/releases/%version%/Altos-Windows-%version_dash%.exe) + - [Mac OS X Package](/AltOS/releases/%version%/Altos-Mac-%version%.dmg) + - [Linux](/AltOS/releases/%version%/Altos-Linux-%version%.sh) + - [Source Snapshot](http://git.gag.com/?p=fw/altos;a=snapshot;h=refs/tags/%version%;sf=tgz) |