public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
{
JTabbedPane pane;
- AltosGraph graph;
+ AltosGraphNew graph;
AltosUIEnable enable;
AltosUIMap map;
AltosState state;
enable.units_changed(imperial_units);
}
- AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
+ AltosGraphUI(AltosStateIterable states, AltosRecordSet record_set, File file) throws InterruptedException, IOException {
super(file.getName());
state = null;
enable = new AltosUIEnable();
stats = new AltosFlightStats(states);
- graphDataSet = new AltosGraphDataSet(states);
+// graphDataSet = new AltosGraphDataSet(states);
- graph = new AltosGraph(enable, stats, graphDataSet);
+ graph = new AltosGraphNew(enable, stats, record_set);
statsTable = new AltosFlightStatsTable(stats);
String filename = file.getName();
try {
AltosStateIterable states = null;
+ AltosRecordSet record_set = null;
if (filename.endsWith("eeprom")) {
FileReader in = new FileReader(file);
states = new AltosEepromFile(in);
+ record_set = new AltosEepromRecordSet(new FileReader(file));
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
states = new AltosTelemetryFile(in);
throw new FileNotFoundException(filename);
}
try {
- new AltosGraphUI(states, file);
+ new AltosGraphUI(states, record_set, file);
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
if (states == null)
return;
try {
- new AltosGraphUI(states, chooser.file());
+ new AltosGraphUI(states, new AltosEepromRecordSet(new FileReader(chooser.file())), chooser.file());
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
if (states == null)
return false;
try {
- new AltosGraphUI(states, file);
+ new AltosGraphUI(states, new AltosEepromRecordSet(new FileReader(file)), file);
return true;
} catch (InterruptedException ie) {
} catch (IOException ie) {