X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosFlightStatsTable.java;h=f354401b43d3b4f24a7f27e68b218875d63af320;hp=7e3be1ea5fb5dfd4dc7ec7007cff85855b03b1b3;hb=ec46adee44ea08120b1940ca55a5fbdf56874bb1;hpb=a61217f0a6d0ef48b6471f632c4600255867e831

diff --git a/altosuilib/AltosFlightStatsTable.java b/altosuilib/AltosFlightStatsTable.java
index 7e3be1ea..f354401b 100644
--- a/altosuilib/AltosFlightStatsTable.java
+++ b/altosuilib/AltosFlightStatsTable.java
@@ -16,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_12;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import javax.swing.*;
 import java.util.*;
-import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosFlightStatsTable extends JComponent implements AltosFontListener {
 	GridBagLayout	layout;
@@ -38,6 +38,11 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 				value[i].setFont(AltosUILib.value_font);
 		}
 
+		public void set(String ... values) {
+			for (int j = 0; j < values.length; j++)
+				value[j].setText(values[j]);
+		}
+
 		public FlightStat(GridBagLayout layout, int y, String label_text, String ... values) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.insets = new Insets(AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad);
@@ -87,6 +92,43 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 		return String.format("%s %4d° %9.6f'", h, deg, min);
 	}
 
+	private FlightStat	max_height_stat;
+	private FlightStat	max_speed_stat;
+	private FlightStat	max_accel_stat;
+	private FlightStat	boost_accel_stat;
+	private FlightStat	drogue_descent_stat;
+	private FlightStat	main_descent_stat;
+
+	public void set_values(AltosFlightStats stats) {
+		if (max_height_stat != null && stats.max_height != AltosLib.MISSING) {
+			max_height_stat.set(String.format("%6.1f m", stats.max_height),
+					    String.format("%5.0f ft", AltosConvert.meters_to_feet(stats.max_height)));
+		}
+		if (max_speed_stat != null && stats.max_speed != AltosLib.MISSING) {
+			max_speed_stat.set(String.format("%6.1f m/s", 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 (max_accel_stat != null && stats.max_acceleration != AltosLib.MISSING) {
+			max_accel_stat.set(String.format("%6.1f m/s²", stats.max_acceleration),
+					   String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.max_acceleration)),
+					   String.format("%6.2f G", AltosConvert.meters_to_g(stats.max_acceleration)));
+		}
+		if (boost_accel_stat != null && stats.state_accel[AltosLib.ao_flight_boost] != AltosLib.MISSING) {
+			boost_accel_stat.set(String.format("%6.1f 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("%6.2f G", AltosConvert.meters_to_g(stats.state_accel[AltosLib.ao_flight_boost])));
+		}
+		if (drogue_descent_stat != null && stats.state_speed[AltosLib.ao_flight_drogue] != AltosLib.MISSING) {
+			drogue_descent_stat.set(String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_drogue]),
+						String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_drogue])));
+		}
+		if (main_descent_stat != null && stats.state_speed[AltosLib.ao_flight_main] != AltosLib.MISSING) {
+				main_descent_stat.set(String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_main]),
+						      String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_main])));
+		}
+	}
+
 	public void set_stats(AltosFlightStats stats) {
 		int y = 0;
 		if (stats.serial != AltosLib.MISSING) {
@@ -113,9 +155,9 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 					       String.format("%02d:%02d:%02d UTC", stats.hour, stats.minute, stats.second));
 		}
 		if (stats.max_height != AltosLib.MISSING) {
-			new FlightStat(layout, y++, "Maximum height",
-				       String.format("%6.1f m", stats.max_height),
-				       String.format("%5.0f ft", AltosConvert.meters_to_feet(stats.max_height)));
+			max_height_stat = new FlightStat(layout, y++, "Maximum height",
+							 String.format("%6.1f m", stats.max_height),
+							 String.format("%5.0f ft", AltosConvert.meters_to_feet(stats.max_height)));
 		}
 		if (stats.max_gps_height != AltosLib.MISSING) {
 			new FlightStat(layout, y++, "Maximum GPS height",
@@ -123,26 +165,26 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 				       String.format("%5.0f ft", AltosConvert.meters_to_feet(stats.max_gps_height)));
 		}
 		if (stats.max_speed != AltosLib.MISSING) {
-			new FlightStat(layout, y++, "Maximum speed",
-				       String.format("%6.1f m/s", 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)));
+			max_speed_stat = new FlightStat(layout, y++, "Maximum speed",
+							String.format("%6.1f m/s", 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)
-			new FlightStat(layout, y++, "Maximum boost acceleration",
-				       String.format("%6.1f m/s²", stats.max_acceleration),
-				       String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.max_acceleration)),
-				       String.format("%6.2f G", AltosConvert.meters_to_g(stats.max_acceleration)));
+			max_accel_stat = new FlightStat(layout, y++, "Maximum boost acceleration",
+							String.format("%6.1f m/s²", stats.max_acceleration),
+							String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.max_acceleration)),
+							String.format("%6.2f 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("%6.1f 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("%6.2f G", AltosConvert.meters_to_g(stats.state_accel[AltosLib.ao_flight_boost])));
-		if (stats.state_start[AltosLib.ao_flight_boost] < stats.state_end[AltosLib.ao_flight_coast]) {
+			boost_accel_stat = new FlightStat(layout, y++, "Average boost acceleration",
+							  String.format("%6.1f 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("%6.2f G", AltosConvert.meters_to_g(stats.state_accel[AltosLib.ao_flight_boost])));
+		if (stats.state_time[AltosLib.ao_flight_boost] != 0 || stats.state_time[AltosLib.ao_flight_fast] != 0 || stats.state_time[AltosLib.ao_flight_coast] != 0) {
 
-			double	boost_time = stats.state_end[AltosLib.ao_flight_boost] - stats.state_start[AltosLib.ao_flight_boost];
-			double	fast_time = stats.state_end[AltosLib.ao_flight_fast] - stats.state_start[AltosLib.ao_flight_fast];
-			double	coast_time = stats.state_end[AltosLib.ao_flight_coast] - stats.state_start[AltosLib.ao_flight_coast];
+			double	boost_time = stats.state_time[AltosLib.ao_flight_boost];
+			double	fast_time = stats.state_time[AltosLib.ao_flight_fast];
+			double	coast_time = stats.state_time[AltosLib.ao_flight_coast];
 
 			if (fast_time > 0) {
 				new FlightStat(layout, y++, "Ascent time",
@@ -167,18 +209,18 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 				label = "Descent rate";
 			else
 				label = "Drogue descent rate";
-			new FlightStat(layout, y++, label,
+			drogue_descent_stat = new FlightStat(layout, y++, label,
 				       String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_drogue]),
 				       String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_drogue])));
 		}
 		if (stats.state_speed[AltosLib.ao_flight_main] != AltosLib.MISSING)
-			new FlightStat(layout, y++, "Main descent rate",
-				       String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_main]),
-				       String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_main])));
-		if (stats.state_start[AltosLib.ao_flight_drogue] < stats.state_end[AltosLib.ao_flight_main]) {
-			double	drogue_duration = stats.state_end[AltosLib.ao_flight_drogue] - stats.state_start[AltosLib.ao_flight_drogue];
-			double	main_duration = stats.landed_time - stats.state_start[AltosLib.ao_flight_main];
-			double	duration = stats.landed_time - stats.state_start[AltosLib.ao_flight_drogue];
+			main_descent_stat = new FlightStat(layout, y++, "Main descent rate",
+							   String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_main]),
+							   String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_main])));
+		if (stats.state_time[AltosLib.ao_flight_drogue] != 0 || stats.state_time[AltosLib.ao_flight_main] != 0) {
+			double	drogue_duration = stats.state_time[AltosLib.ao_flight_drogue];
+			double	main_duration = stats.state_time[AltosLib.ao_flight_main];
+			double	duration = drogue_duration + main_duration;
 
 			if (drogue_duration > 0 && main_duration > 0) {
 				new FlightStat(layout, y++, "Descent time",
@@ -191,7 +233,7 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 					       String.format("%6.1f s", duration));
 			}
 		}
-		if (stats.state_start[AltosLib.ao_flight_boost] < stats.state_start[AltosLib.ao_flight_landed])
+		if (stats.landed_time > stats.boost_time)
 			new FlightStat(layout, y++, "Flight time",
 				       String.format("%6.1f s", stats.landed_time - stats.boost_time));
 		if (stats.has_gps && stats.pad_lat != AltosLib.MISSING) {
@@ -210,6 +252,10 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 		AltosUIPreferences.unregister_font_listener(this);
 	}
 
+	public void filter_changed(AltosFlightStats stats) {
+		set_values(stats);
+	}
+
 	public AltosFlightStatsTable() {
 		layout = new GridBagLayout();