projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telemega-v5.0: Add Makefiles
[fw/altos]
/
altosuilib
/
AltosCSVUI.java
diff --git
a/altosuilib/AltosCSVUI.java
b/altosuilib/AltosCSVUI.java
index 353b51271c60dfbd8393f189749e27f978aaa7af..24720e9cb168e7ee914de8aaa8c2fb3cbae9f060 100644
(file)
--- a/
altosuilib/AltosCSVUI.java
+++ b/
altosuilib/AltosCSVUI.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,13
+16,13
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_
7
;
+package org.altusmetrum.altosuilib_
14
;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
-import org.altusmetrum.altoslib_
7
.*;
+import org.altusmetrum.altoslib_
14
.*;
public class AltosCSVUI
extends AltosUIDialog
public class AltosCSVUI
extends AltosUIDialog
@@
-30,7
+31,8
@@
public class AltosCSVUI
JFileChooser csv_chooser;
JPanel accessory;
JComboBox<String> combo_box;
JFileChooser csv_chooser;
JPanel accessory;
JComboBox<String> combo_box;
- Iterable<AltosState> states;
+ AltosFlightSeries series;
+ AltosCalData cal_data;
AltosWriter writer;
static String[] combo_box_items = { "Comma Separated Values (.CSV)", "Googleearth Data (.KML)" };
AltosWriter writer;
static String[] combo_box_items = { "Comma Separated Values (.CSV)", "Googleearth Data (.KML)" };
@@
-54,8
+56,9
@@
public class AltosCSVUI
set_default_file();
}
set_default_file();
}
- public AltosCSVUI(JFrame frame, AltosStateIterable states, File source_file) {
- this.states = states;
+ public AltosCSVUI(JFrame frame, AltosFlightSeries series, File source_file) {
+ this.series = series;
+ this.cal_data = series.cal_data();
csv_chooser = new JFileChooser(source_file);
accessory = new JPanel();
csv_chooser = new JFileChooser(source_file);
accessory = new JPanel();
@@
-90,7
+93,7
@@
public class AltosCSVUI
writer = new AltosCSV(file);
else
writer = new AltosKML(file);
writer = new AltosCSV(file);
else
writer = new AltosKML(file);
- writer.write(s
tat
es);
+ writer.write(s
eri
es);
writer.close();
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(frame,
writer.close();
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(frame,