X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=4bc2a5f86cb722b79a8e7c697fbc900bd91d4943;hb=198a3d4d5f51de5c0f0413299582479cde4e177f;hp=ac121512c3a544eef1b8a9429ee7a0211bf61393;hpb=da914cd72411af8c36af05b13c11b9093c8a378c;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index ac121512..4bc2a5f8 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -23,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
@@ -276,7 +276,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void ConfigureTeleMetrum() {
-		new AltosConfig(AltosUI.this);
+		new AltosConfigFC(AltosUI.this);
 	}
 
 	void ConfigureTeleDongle() {
@@ -342,7 +342,7 @@ public class AltosUI extends AltosUIFrame {
 		if (set == null)
 			return;
 		AltosFlightSeries series = make_series(set);
-		new AltosCSVUI(AltosUI.this, series, series.cal_data, chooser.file());
+		new AltosCSVUI(AltosUI.this, series, chooser.file());
 	}
 
 	/* Load a flight log CSV file and display a pretty graph.
@@ -520,11 +520,12 @@ public class AltosUI extends AltosUIFrame {
 			System.out.printf("Main rate:   %6.0f m/s  %6.0f ft/s\n",
 					  stats.state_speed[Altos.ao_flight_main],
 					  AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main]));
-		if (stats.state_end[Altos.ao_flight_main] != AltosLib.MISSING &&
-		    stats.state_start[Altos.ao_flight_boost] != AltosLib.MISSING)
+		if (stats.landed_time != AltosLib.MISSING &&
+		    stats.boost_time != AltosLib.MISSING &&
+		    stats.landed_time > stats.boost_time)
 			System.out.printf("Flight time: %6.0f s\n",
-					  stats.state_end[Altos.ao_flight_main] -
-					  stats.state_start[Altos.ao_flight_boost]);
+					  stats.landed_time -
+					  stats.boost_time);
 		System.out.printf("\n");
 		return true;
 	}