X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosFlightStatsTable.java;h=6171f61ac5d3c4ae1b8d8d518146cdc3ff50a85f;hp=9c613365af69105c1866558095a592b84451ebad;hb=1a797f5fd5d25ba635fd79ad7604763253caabf2;hpb=87c8bb3956897830da1f7aaca2990a9571767b73 diff --git a/altosuilib/AltosFlightStatsTable.java b/altosuilib/AltosFlightStatsTable.java index 9c613365..6171f61a 100644 --- a/altosuilib/AltosFlightStatsTable.java +++ b/altosuilib/AltosFlightStatsTable.java @@ -15,12 +15,12 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_8; +package org.altusmetrum.altosuilib_10; import java.awt.*; import javax.swing.*; import java.util.*; -import org.altusmetrum.altoslib_8.*; +import org.altusmetrum.altoslib_10.*; public class AltosFlightStatsTable extends JComponent implements AltosFontListener { GridBagLayout layout; @@ -117,18 +117,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]),