Have the SimulationPlotConfigDialog be populated with the currently selected items.

[debian/openrocket] / android / src / net / sf / openrocket / android / simulation / SimulationChart.java

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
index afe1edb83cf0e7d88acfde8ba692b97649f45594..601bf859c92f9074e8cd501195ebe980445b9411 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
@@ -17,9 +17,7 @@ package net.sf.openrocket.android.simulation;
 \r
 import java.io.Serializable;\r
 import java.util.ArrayList;\r
-import java.util.HashMap;\r
 import java.util.List;\r
-import java.util.Map;\r
 \r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.document.OpenRocketDocument;\r
@@ -58,7 +56,7 @@ public class SimulationChart implements Serializable {
        private final int simulationIndex;\r
        private transient FlightDataType series1;\r
        private transient FlightDataType series2;\r
-       private transient Map<Double,String> events;\r
+       private transient List<FlightEvent> events;\r
        \r
        // Define 4 different colors and point styles to use for the series.\r
        // For now only 2 series are supported though.\r
@@ -79,14 +77,26 @@ public class SimulationChart implements Serializable {
                this.series1 = series1;\r
        }\r
 \r
+       public FlightDataType getSeries1() {\r
+               return series1;\r
+       }\r
+\r
        public void setSeries2(FlightDataType series2) {\r
                this.series2 = series2;\r
        }\r
 \r
-       public void setEvents( Map<Double,String> events ) {\r
+       public FlightDataType getSeries2() {\r
+               return series2;\r
+       }\r
+\r
+       public void setEvents( List<FlightEvent> events ) {\r
                this.events = events;\r
        }\r
        \r
+       public List<FlightEvent> getEvents() {\r
+               return events;\r
+       }\r
+\r
        public FlightDataBranch getFlightDataBranch( OpenRocketDocument rocketDocument ) {\r
                Simulation sim = rocketDocument.getSimulation(simulationIndex);\r
                FlightDataBranch flightDataBranch = sim.getSimulatedData().getBranch(0);\r
@@ -111,9 +121,9 @@ public class SimulationChart implements Serializable {
                }\r
                \r
                if ( events == null ) {\r
-                       events = new HashMap<Double,String>();\r
+                       events = new ArrayList<FlightEvent>();\r
                        for ( FlightEvent event : flightDataBranch.getEvents() ) {\r
-                               events.put(event.getTime(), event.getType().toString() );\r
+                               events.add(event);\r
                        }\r
                }\r
 \r
@@ -142,8 +152,8 @@ public class SimulationChart implements Serializable {
                renderer.setShowCustomTextGrid(true);\r
                renderer.setXLabelsAlign(Align.RIGHT);\r
                renderer.setXLabelsAngle(90);  // rotate right\r
-               for( Map.Entry<Double,String> event : events.entrySet() ) {\r
-                       renderer.addXTextLabel(event.getKey(), event.getValue());\r
+               for( FlightEvent event : events ) {\r
+                       renderer.addXTextLabel(event.getTime(), event.getType().toString());\r
                }\r
 \r
                renderer.setMargins(new int[] { 50, 30, 0, 20 });\r