diff options
| -rw-r--r-- | altosui/AltosGraphUI.java | 8 | ||||
| -rw-r--r-- | altosui/AltosLanded.java | 4 | ||||
| -rw-r--r-- | altosui/AltosUI.java | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 4ca2b77c..50a1948e 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -34,7 +34,7 @@ import org.jfree.ui.RefineryUtilities; public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener { JTabbedPane pane; - AltosGraph graph; + AltosGraphNew graph; AltosUIEnable enable; AltosUIMap map; AltosState state; @@ -69,7 +69,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt 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; @@ -78,9 +78,9 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt 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); diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java index 25d4fcc8..95cab605 100644 --- a/altosui/AltosLanded.java +++ b/altosui/AltosLanded.java @@ -124,9 +124,11 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener { 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); @@ -134,7 +136,7 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener { throw new FileNotFoundException(filename); } try { - new AltosGraphUI(states, file); + new AltosGraphUI(states, record_set, file); } catch (InterruptedException ie) { } catch (IOException ie) { } diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 72c3c161..7caaa3e9 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -348,7 +348,7 @@ public class AltosUI extends AltosUIFrame { 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) { } @@ -487,7 +487,7 @@ public class AltosUI extends AltosUIFrame { 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) { |