X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosFlightStatsTable.java;h=2f46f231cbc0221dc9ffb1a3520f854eeb23bbb5;hp=4240bf9fb52dac725bb951a5a28bdb0d9cbfca46;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c

diff --git a/altosuilib/AltosFlightStatsTable.java b/altosuilib/AltosFlightStatsTable.java
index 4240bf9f..2f46f231 100644
--- a/altosuilib/AltosFlightStatsTable.java
+++ b/altosuilib/AltosFlightStatsTable.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
@@ -15,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_11;
 
 import java.awt.*;
 import javax.swing.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosFlightStatsTable extends JComponent implements AltosFontListener {
 	GridBagLayout	layout;
@@ -117,18 +118,18 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 		}
 		new FlightStat(layout, y++, "Maximum speed",
 			       String.format("%5.0f m/s", stats.max_speed),
-			       String.format("%5.0f mph", AltosConvert.meters_to_mph(stats.max_speed)),
+			       String.format("%5.0f fps", AltosConvert.mps_to_fps(stats.max_speed)),
 			       String.format("Mach %4.1f", AltosConvert.meters_to_mach(stats.max_speed)));
-		if (stats.max_acceleration != AltosLib.MISSING) {
+		if (stats.max_acceleration != AltosLib.MISSING)
 			new FlightStat(layout, y++, "Maximum boost acceleration",
 				       String.format("%5.0f m/s²", stats.max_acceleration),
 				       String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.max_acceleration)),
 				       String.format("%5.0f G", AltosConvert.meters_to_g(stats.max_acceleration)));
+		if (stats.state_accel[AltosLib.ao_flight_boost] != AltosLib.MISSING)
 			new FlightStat(layout, y++, "Average boost acceleration",
 				       String.format("%5.0f m/s²", stats.state_accel[AltosLib.ao_flight_boost]),
 				       String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.state_accel[AltosLib.ao_flight_boost])),
 				       String.format("%5.0f G", AltosConvert.meters_to_g(stats.state_accel[AltosLib.ao_flight_boost])));
-		}
 		if (stats.state_speed[AltosLib.ao_flight_drogue] != AltosLib.MISSING)
 			new FlightStat(layout, y++, "Drogue descent rate",
 				       String.format("%5.0f m/s", stats.state_speed[AltosLib.ao_flight_drogue]),