altosuilib: Rewrite map GUI bits

[fw/altos] / telegps / TeleGPSGraphUI.java

diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
index 84c80815d82875630778c2548e8505c70c992d53..fbc9657e1b7d0fc6d22906d3f74fca5980b36731 100644 (file)
--- a/telegps/TeleGPSGraphUI.java
+++ b/telegps/TeleGPSGraphUI.java
@@ -38,10 +38,11 @@ public class TeleGPSGraphUI extends AltosUIFrame
        JTabbedPane             pane;
        AltosGraph              graph;
        AltosUIEnable           enable;
        JTabbedPane             pane;
        AltosGraph              graph;
        AltosUIEnable           enable;

-       AltosSiteMap            map;
+       AltosUIMap              map;

        AltosState              state;
        AltosFlightStats        stats;
        AltosGraphDataSet       graphDataSet;
        AltosState              state;
        AltosFlightStats        stats;
        AltosGraphDataSet       graphDataSet;

+       AltosFlightStatsTable   statsTable;

 
        void fill_map(AltosStateIterable states) {
                for (AltosState state : states) {
 
        void fill_map(AltosStateIterable states) {
                for (AltosState state : states) {


@@ -66,10 +67,13 @@ public class TeleGPSGraphUI extends AltosUIFrame
                stats = new AltosFlightStats(states);
                graphDataSet = new AltosGraphDataSet(states);
                graph = new AltosGraph(enable, stats, graphDataSet);
                stats = new AltosFlightStats(states);
                graphDataSet = new AltosGraphDataSet(states);
                graph = new AltosGraph(enable, stats, graphDataSet);

-               map = new AltosSiteMap();
+               statsTable = new AltosFlightStatsTable(stats);
+
+               map = new AltosUIMap();

 
                pane.add("Flight Graph", graph.panel);
                pane.add("Configure Graph", enable);
 
                pane.add("Flight Graph", graph.panel);
                pane.add("Configure Graph", enable);

+               pane.add("Statistics", statsTable);

                fill_map(states);
                pane.add("Map", map);
 
                fill_map(states);
                pane.add("Map", map);