projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/telegps: Display error message when attempting to graph unknown files
[fw/altos]
/
telegps
/
TeleGPS.java
diff --git
a/telegps/TeleGPS.java
b/telegps/TeleGPS.java
index 24cc379fcec9a1879068d5154de8fcfc60c3c4fb..af6d01b427126c1071a3d4c95beee4d536011401 100644
(file)
--- a/
telegps/TeleGPS.java
+++ b/
telegps/TeleGPS.java
@@
-307,26
+307,14
@@
public class TeleGPS
void graph() {
AltosDataChooser chooser = new AltosDataChooser(this);
AltosRecordSet set = chooser.runDialog();
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);
}
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);
}
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 == 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) {
try {
new TeleGPSGraphUI(set, file);
} catch (Exception e) {
@@
-662,6
+656,11
@@
public class TeleGPS
return true;
}
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)
static boolean process_replay(File file) {
AltosReplayReader new_reader = replay_file(file);
if (new_reader == null)