X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPS.java;h=af6d01b427126c1071a3d4c95beee4d536011401;hb=ee7a54b3215ffa1eb38f16a151c0740b14b60857;hp=1433c9e164c01bade972e009d7a7b42f6c13d0e8;hpb=9a7b4f02ad32ca43a45ed9fe446b8db96e60b5e5;p=fw%2Faltos

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index 1433c9e1..af6d01b4 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -25,8 +25,8 @@ import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.text.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 public class TeleGPS
 	extends AltosUIFrame
@@ -307,26 +307,14 @@ public class TeleGPS
 	void graph() {
 		AltosDataChooser chooser = new AltosDataChooser(this);
 		AltosRecordSet set = chooser.runDialog();
-		if (set == null)
-			return;
-		try {
-			new TeleGPSGraphUI(set, chooser.file());
-		} catch (InterruptedException ie) {
-		} catch (IOException ie) {
-		}
+		graph_file(this, set, chooser.file());
 	}
 
 	public void graph_flights(AltosEepromList list) {
 		for (AltosEepromLog log : list) {
 			if (log.file != null) {
 				AltosRecordSet set = record_set(log.file);
-				if (set != null) {
-					try {
-						new TeleGPSGraphUI(set, log.file);
-					} catch (InterruptedException ie) {
-					} catch (IOException ie) {
-					}
-				}
+				graph_file(this, set, log.file);
 			}
 		}
 	}
@@ -650,10 +638,16 @@ public class TeleGPS
 		return new AltosReplayReader(set, file);
 	}
 
-	static boolean process_graph(File file) {
-		AltosRecordSet set = record_set(file);
+	private static boolean graph_file(TeleGPS telegps, AltosRecordSet set, File file) {
 		if (set == null)
 			return false;
+		if (!set.valid()) {
+			JOptionPane.showMessageDialog(telegps,
+						      String.format("Failed to parse file %s", file),
+						      "Graph Failed",
+						      JOptionPane.ERROR_MESSAGE);
+			return false;
+		}
 		try {
 			new TeleGPSGraphUI(set, file);
 		} catch (Exception e) {
@@ -662,6 +656,11 @@ public class TeleGPS
 		return true;
 	}
 
+	static boolean process_graph(File file) {
+		AltosRecordSet set = record_set(file);
+		return graph_file(null, set, file);
+	}
+
 	static boolean process_replay(File file) {
 		AltosReplayReader new_reader = replay_file(file);
 		if (new_reader == null)